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.
--- a/tests/test-clone.t Mon Feb 29 13:46:54 2016 +0000
+++ b/tests/test-clone.t Thu Mar 03 23:11:33 2016 -0800
@@ -1067,18 +1067,18 @@
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