--- a/tests/test-largefiles-update.t Mon Jan 12 18:01:20 2015 -0700
+++ b/tests/test-largefiles-update.t Fri Jan 09 10:52:14 2015 -0800
@@ -366,15 +366,15 @@
$ hg update -q -C 2
$ hg strip 3 4
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-backup.hg (glob)
- $ mv .hg/strip-backup/9530e27857f7-backup.hg $TESTTMP
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-2e7b195d-backup.hg (glob)
+ $ mv .hg/strip-backup/9530e27857f7-2e7b195d-backup.hg $TESTTMP
(internal linear merging at "hg pull --update")
$ echo 'large1 for linear merge (conflict)' > large1
$ echo 'large2 for linear merge (conflict with normal file)' > large2
- $ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-backup.hg
- pulling from $TESTTMP/9530e27857f7-backup.hg (glob)
+ $ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg
+ pulling from $TESTTMP/9530e27857f7-2e7b195d-backup.hg (glob)
searching for changes
adding changesets
adding manifests
@@ -408,7 +408,7 @@
$ echo 'large1 for linear merge (conflict)' > large1
$ echo 'large2 for linear merge (conflict with normal file)' > large2
- $ hg unbundle --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-backup.hg
+ $ hg unbundle --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg
adding changesets
adding manifests
adding file changes