Resolve conflicts by taking the already-fixed about.js and locally-fixed constants.js.in.
authorEdward Lee <edilee@mozilla.com>
Wed, 16 Sep 2009 13:56:37 -0700
changeset 45759 a346dd8eb6aa5437f994a755baa1028b16cde5f1
parent 45758 a6000515c90e475d6eef2d3467deccc261883999
child 45760 5b9117a48648aedfe3ce5f1476cef1cbc64755f8
push id14033
push useredward.lee@engineering.uiuc.edu
push dateWed, 23 Jun 2010 22:21:35 +0000
treeherdermozilla-central@227db4ad8cdf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
Resolve conflicts by taking the already-fixed about.js and locally-fixed constants.js.in.
services/sync/modules/constants.js
--- a/services/sync/modules/constants.js
+++ b/services/sync/modules/constants.js
@@ -29,45 +29,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-<<<<<<< local
 // Process each item in the "constants hash" to add to "global" and give a name
 let EXPORTED_SYMBOLS = [((this[key] = val), key) for ([key, val] in Iterator({
-=======
-const EXPORTED_SYMBOLS = ["WEAVE_VERSION", "COMPATIBLE_VERSION",
-			  "PREFS_BRANCH", "PWDMGR_HOST",
-			  'MODE_RDONLY', 'MODE_WRONLY',
-			  'MODE_CREATE', 'MODE_APPEND', 'MODE_TRUNCATE',
-			  'PERMS_FILE', 'PERMS_PASSFILE', 'PERMS_DIRECTORY',
-			  'ONE_BYTE', 'ONE_KILOBYTE', 'ONE_MEGABYTE',
-        'CONNECTION_TIMEOUT', 'MAX_UPLOAD_RECORDS',
-        'SYNC_SUCCEEDED', 'LOGIN_SUCCEEDED', 'ENGINE_SUCCEEDED',
-        'STATUS_OK', 'LOGIN_FAILED', 'SYNC_FAILED',
-        'SYNC_FAILED_PARTIAL', 'STATUS_DISABLED', 'SERVER_LOW_QUOTA',
-        'SERVER_DOWNTIME', 'SERVER_UNREACHABLE',
-        'LOGIN_FAILED_NO_USERNAME', 'LOGIN_FAILED_NO_PASSWORD',
-        'LOGIN_FAILED_NETWORK_ERROR','LOGIN_FAILED_INVALID_PASSPHRASE', 
-        'LOGIN_FAILED_LOGIN_REJECTED', 'METARECORD_DOWNLOAD_FAIL',
-        'VERSION_OUT_OF_DATE', 'DESKTOP_VERSION_OUT_OF_DATE',
-        'KEYS_DOWNLOAD_FAIL', 'NO_KEYS_NO_KEYGEN', 'KEYS_UPLOAD_FAIL',
-        'ENGINE_UPLOAD_FAIL', 'ENGINE_DOWNLOAD_FAIL', 'ENGINE_UNKNOWN_FAIL',
-        'ENGINE_METARECORD_UPLOAD_FAIL',
-        'SETUP_FAILED_NO_PASSPHRASE', 'ABORT_SYNC_COMMAND',
-        'kSyncWeaveDisabled', 'kSyncNotLoggedIn',
-        'kSyncNetworkOffline', 'kSyncInPrivateBrowsing',
-        'kSyncNotScheduled',
-        'FIREFOX_ID', 'THUNDERBIRD_ID', 'FENNEC_ID', 'SEAMONKEY_ID',
-        'UI_DATA_TYPES_PER_ROW'];
->>>>>>> other
 
 WEAVE_VERSION:                         "@weave_version@",
 
 // Last client version this client can read. If the server contains an older
 // version, this client will wipe the data on the server first.
 COMPATIBLE_VERSION:                    "@compatible_version@",
 
 PREFS_BRANCH:                          "extensions.weave.",
@@ -130,33 +103,19 @@ ENGINE_METARECORD_UPLOAD_FAIL:         "
 kSyncWeaveDisabled:                    "Weave is disabled",
 kSyncNotLoggedIn:                      "User is not logged in",
 kSyncNetworkOffline:                   "Network is offline",
 kSyncInPrivateBrowsing:                "Private browsing is enabled",
 kSyncNotScheduled:                     "Not scheduled to do sync",
 kSyncBackoffNotMet:                    "Trying to sync before the server said it's okay",
 
 // Application IDs
-<<<<<<< local
 FIREFOX_ID:                            "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}",
 THUNDERBIRD_ID:                        "{3550f703-e582-4d05-9a08-453d09bdfdc6}",
 FENNEC_ID:                             "{a23983c0-fd0e-11dc-95ff-0800200c9a66}",
 SEAMONKEY_ID:                          "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}",
-=======
-const FIREFOX_ID = "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
-const THUNDERBIRD_ID = "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
-const FENNEC_ID = "{a23983c0-fd0e-11dc-95ff-0800200c9a66}";
-const SEAMONKEY_ID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
->>>>>>> other
 
-<<<<<<< local
 // UI constants
-=======
-//UI constants
->>>>>>> other
 
 // How many data types (bookmarks, history, etc) to display per row
-<<<<<<< local
 UI_DATA_TYPES_PER_ROW:                 3,
 
 }))];
-=======
-const UI_DATA_TYPES_PER_ROW = 3;>>>>>>> other