[PATCH] tests: update test output for test written on stable branch (issue5104)

Gregory Szorc gregory.szorc at gmail.com
Fri Mar 4 02:15:39 EST 2016


# HG changeset patch
# User Gregory Szorc <gregory.szorc at gmail.com>
# Date 1457075493 28800
#      Thu Mar 03 23:11:33 2016 -0800
# Node ID e69343e80aecb0aa4a8d4dd2756ff2f84f5ab108
# Parent  e00e57d836535aadcb13337613d2f891492d8e04
tests: update test output for test written on stable branch (issue5104)

The changed test lines were added in d493d64757eb, which
landed on stable. When this changeset merged to the default
branch, the test failed because a4692267bc2d (on default
but not stable) changed the order of working directory update
when performing a share-based clone from pooled storage.

The changes in this patch are similar to test changes in
a4692267bc2d.

diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -1062,23 +1062,23 @@ Cloning into pooled storage doesn't race
   
   $ cat race1.log
   (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
-  updating working directory
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   searching for changes
   no changes found
   adding remote bookmark bookA
+  updating working directory
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cat race2.log
   (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
-  updating working directory
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   waiting for lock on repository share-destrace2 held by * (glob)
   got lock after \d+ seconds (re)
   searching for changes
   no changes found
   adding remote bookmark bookA
+  updating working directory
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved


More information about the Mercurial-devel mailing list