Changeset 45

Timestamp:

12/22/07 19:22:12 (1 year ago)

Author:

bkuhn

Message:

• Added update/merge/update sequence for Mercurial
  
• add -f option to push
  

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/dev-tools/update-loblaw-test.plx (modified) (2 diffs)

trunk/ChangeLog

@@ -2 +2 @@
-
-        * dev-tools/update-loblaw-test.plx (ProcessRevision): Moved around
-
+
+
-
-        * configs/ldap/slapd.conf: Fixed password-hash to be {SSHA}.

trunk/dev-tools/update-loblaw-test.plx

@@ -301 +301 @@
-    next unless defined $DUAL_REVISIONED_FILE_LIST{$inputFile};
-    my $outputFile = $DUAL_REVISIONED_FILE_LIST{$inputFile};
+
+    chdir $LOBLAW_TEST_HG_CHECKOUT or
+      DieLog("unable to change directory to $LOBLAW_TEST_HG_CHECKOUT: $!");
+
+    read_from_process($HG, 'update');
+    read_from_process($HG, 'merge');
+    read_from_process($HG, 'update');
-
-    chdir $LOBLAW_TRUNK_CHECKOUT or
@@ -359 +366 @@
-  chdir $LOBLAW_TEST_HG_CHECKOUT or
-      DieLog("unable to change directory to $LOBLAW_TEST_HG_CHECKOUT: $!");
-
+, '-f'
-  &$LOCK_CLEANUP_CODE;
-}