tests: make 'saved backup' globbing less narrow in rebase tests
Globbing the hash made it harder to maintain tests with run-tests -i when it
was so far by the generated test output.
The hashes are stable and we just need to add a (glob).
--- a/tests/test-bookmarks-rebase.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-bookmarks-rebase.t Sun Dec 07 20:04:45 2014 +0100
@@ -37,7 +37,7 @@
rebase
$ hg rebase -s two -d one
- saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-backup.hg (glob)
$ hg log
changeset: 3:42e5ed2cdcf4
--- a/tests/test-rebase-abort.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-abort.t Sun Dec 07 20:04:45 2014 +0100
@@ -70,7 +70,7 @@
Abort:
$ hg rebase --abort
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-backup.hg (glob)
rebase aborted
$ hg tglog
--- a/tests/test-rebase-bookmarks.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-bookmarks.t Sun Dec 07 20:04:45 2014 +0100
@@ -74,7 +74,7 @@
o 0: 'A' bookmarks: Y@diverge
$ hg rebase -s Y -d 3
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-backup.hg (glob)
$ hg tglog
@ 3: 'C' bookmarks: Y Z
@@ -95,7 +95,7 @@
$ hg book W@diverge
$ hg rebase -s W -d .
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-backup.hg (glob)
$ hg bookmarks
W 3:0d3554f74897
@@ -112,7 +112,7 @@
$ hg up -q Z
$ hg rebase -s 1 -d 3
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-backup.hg (glob)
$ hg tglog
@ 3: 'C' bookmarks: Y Z
@@ -133,7 +133,7 @@
$ hg up -q X
$ hg rebase -d W
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-backup.hg (glob)
$ hg tglog
o 3: 'C' bookmarks: Y Z
--- a/tests/test-rebase-cache.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-cache.t Sun Dec 07 20:04:45 2014 +0100
@@ -105,7 +105,7 @@
0: 'A'
$ hg rebase -s 5 -d 8
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-backup.hg (glob)
$ hg branches
branch3 8:466cdfb14b62
@@ -166,7 +166,7 @@
o 0: 'A'
$ hg rebase -s 8 -d 6
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-backup.hg (glob)
$ hg branches
branch2 8:6b4bdc1b5ac0
@@ -230,7 +230,7 @@
o 0: 'A'
$ hg rebase -s 7 -d 6
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob)
$ hg branches
branch2 7:6b4bdc1b5ac0
@@ -267,7 +267,7 @@
$ hg strip 2
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-backup.hg (glob)
$ hg tglog
o 3: 'C' branch2
@@ -328,7 +328,7 @@
$ hg strip 2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-backup.hg (glob)
$ hg theads
1: 'branch2' branch2
@@ -373,14 +373,14 @@
$ hg strip 3 4
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-backup.hg (glob)
$ hg theads
2: 'C'
$ hg strip 2 1
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-backup.hg (glob)
$ hg theads
0: 'A'
@@ -477,4 +477,4 @@
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e
HGEDITFORM=rebase.merge
HGEDITFORM=rebase.normal
- saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-backup.hg (glob)
--- a/tests/test-rebase-check-restore.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-check-restore.t Sun Dec 07 20:04:45 2014 +0100
@@ -132,7 +132,7 @@
$ hg resolve -m A
(no more unresolved files)
$ hg rebase --continue
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-backup.hg (glob)
$ hg tglog
@ 5:draft 'F' notdefault
--- a/tests/test-rebase-collapse.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-collapse.t Sun Dec 07 20:04:45 2014 +0100
@@ -75,7 +75,7 @@
HG: added C
HG: added D
====
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
$ hg tglogp
@ 5:secret 'Collapsed revision
@@ -113,7 +113,7 @@
$ hg phase --force --secret 6
$ hg rebase --source 4 --collapse
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-backup.hg (glob)
$ hg tglog
o 6: 'Collapsed revision
@@ -154,7 +154,7 @@
> EOF
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e
HGEDITFORM=rebase.collapse
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob)
$ hg tglog
o 6: 'custom message'
@@ -261,7 +261,7 @@
Rebase and collapse - E onto H:
$ hg rebase -s 4 --collapse # root (4) is not a merge
- saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
$ hg tglog
o 5: 'Collapsed revision
@@ -410,7 +410,7 @@
$ hg rebase -s 4 --collapse # root (4) is not a merge
merging E
- saved backup bundle to $TESTTMP/c1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
$ hg tglog
o 5: 'Collapsed revision
@@ -499,7 +499,7 @@
$ cd d1
$ hg rebase -s 1 --collapse
- saved backup bundle to $TESTTMP/d1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-backup.hg (glob)
$ hg tglog
o 2: 'Collapsed revision
@@ -583,7 +583,7 @@
o 0: 'A'
$ hg rebase -s 5 -d 4
- saved backup bundle to $TESTTMP/e/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-backup.hg (glob)
$ hg tglog
@ 4: 'E'
|
@@ -639,7 +639,7 @@
merging c and f to f
merging f and c to c
merging e and g to g
- saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-backup.hg (glob)
$ hg st
$ hg st --copies --change tip
A d
@@ -678,7 +678,7 @@
Test collapsing in place
$ hg rebase --collapse -b . -d 0
- saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-backup.hg (glob)
$ hg st --change tip --copies
M a
M c
@@ -737,7 +737,7 @@
$ hg strip 2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/f/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-backup.hg (glob)
$ hg tglog
o 1: 'B'
@@ -768,7 +768,7 @@
adding b
$ hg book foo
$ hg rebase -d 0 -r "1::2" --collapse -m collapsed
- saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-backup.hg (glob)
$ hg log -G --template "{rev}: '{desc}' {bookmarks}"
@ 1: 'collapsed' foo
|
--- a/tests/test-rebase-conflicts.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-conflicts.t Sun Dec 07 20:04:45 2014 +0100
@@ -79,7 +79,7 @@
$ hg resolve -m common
(no more unresolved files)
$ hg rebase --continue
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-backup.hg (glob)
$ hg tglog
@ 5:secret 'L3' mybook
--- a/tests/test-rebase-detach.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-detach.t Sun Dec 07 20:04:45 2014 +0100
@@ -48,7 +48,7 @@
$ hg phase --force --secret 3
$ hg rebase -s 3 -d 7
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-backup.hg (glob)
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 7:secret 'D'
@@ -99,7 +99,7 @@
o 0: 'A'
$ hg rebase -s 2 -d 7
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
$ hg tglog
o 7: 'D'
@@ -151,7 +151,7 @@
o 0: 'A'
$ hg rebase -s 1 -d 7
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
$ hg tglog
o 7: 'D'
@@ -205,7 +205,7 @@
o 0: 'A'
$ hg rebase --collapse -s 2 -d 7
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 6:secret 'Collapsed revision
@@ -264,7 +264,7 @@
o 0: 'A'
$ hg rebase -s 1 -d tip
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
$ hg tglog
o 8: 'D'
@@ -325,7 +325,7 @@
$ hg ci -m "J"
$ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other
- saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-backup.hg (glob)
$ hg tglog
@ 8: 'Collapsed revision
--- a/tests/test-rebase-issue-noparam-single-rev.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-issue-noparam-single-rev.t Sun Dec 07 20:04:45 2014 +0100
@@ -52,7 +52,7 @@
$ hg up -q -C 2
$ hg rebase
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-backup.hg (glob)
$ hg tglog
@ 4: 'l1'
@@ -110,7 +110,7 @@
$ hg up -q -C 3
$ hg rebase
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-backup.hg (glob)
$ hg tglog
@ 4: 'l2'
--- a/tests/test-rebase-named-branches.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-named-branches.t Sun Dec 07 20:04:45 2014 +0100
@@ -69,7 +69,7 @@
Branch name containing a dash (issue3181)
$ hg rebase -b dev-two -d dev-one --keepbranches
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-backup.hg (glob)
$ hg tglog
@ 9: 'dev-two named branch' dev-two
@@ -93,7 +93,7 @@
o 0: 'A'
$ hg rebase -s dev-one -d 0 --keepbranches
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob)
$ hg tglog
@ 8: 'dev-two named branch' dev-two
@@ -143,7 +143,7 @@
o 0: 'A'
$ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/77854864208c-backup.hg (glob)
$ hg tglog
o 9: 'dev-two named branch' dev-two
@@ -167,7 +167,7 @@
o 0: 'A'
$ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob)
$ hg tglog
o 8: 'dev-two named branch' dev-two
@@ -192,7 +192,7 @@
Rebasing descendant onto ancestor across different named branches
$ hg rebase -s 1 -d 8 --keepbranches
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
$ hg tglog
o 8: 'D'
@@ -218,7 +218,7 @@
[255]
$ hg rebase -s 5 -d 4
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32d3b0de7f37-backup.hg (glob)
$ hg tglog
o 8: 'D'
@@ -248,7 +248,7 @@
$ hg ci -m 'close b' --close
$ hg rebase -b 8 -d b
reopening closed branch head ea9de14a36c6
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/86693275b2ef-backup.hg (glob)
$ cd ..
--- a/tests/test-rebase-newancestor.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-newancestor.t Sun Dec 07 20:04:45 2014 +0100
@@ -40,7 +40,7 @@
$ hg rebase -s 1 -d 3
merging a
merging a
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-backup.hg (glob)
$ hg tglog
o 3: 'C'
--- a/tests/test-rebase-parameters.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-parameters.t Sun Dec 07 20:04:45 2014 +0100
@@ -120,7 +120,7 @@
$ hg up -q -C 3
$ hg rebase
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
$ hg tglog
@ 8: 'D'
@@ -155,7 +155,7 @@
$ cd a2
$ hg rebase --base .
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
$ hg tglog
@ 8: 'D'
@@ -185,7 +185,7 @@
$ cd a3
$ hg rebase --dest 'branch(.)'
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
$ hg tglog
@ 8: 'D'
@@ -215,7 +215,7 @@
$ cd a4
$ hg rebase --source 'desc("C")'
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
$ hg tglog
o 8: 'D'
@@ -245,7 +245,7 @@
$ cd a5
$ hg rebase --dest 6
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
$ hg tglog
@ 8: 'D'
@@ -275,7 +275,7 @@
$ cd a6
$ hg rebase --base 'desc("D")'
- saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
$ hg tglog
o 8: 'D'
@@ -305,7 +305,7 @@
$ cd a7
$ hg rebase --source 2 --dest 7
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
$ hg tglog
o 8: 'D'
@@ -335,7 +335,7 @@
$ cd a8
$ hg rebase --base 3 --dest 7
- saved backup bundle to $TESTTMP/a8/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
$ hg tglog
o 8: 'D'
@@ -365,7 +365,7 @@
$ cd a9
$ hg rebase --rev 'desc("C")::'
- saved backup bundle to $TESTTMP/a9/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
$ hg tglog
o 8: 'D'
@@ -413,7 +413,7 @@
$ cd b1
$ hg rebase -s 2 -d 1 --tool internal:local
- saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-backup.hg (glob)
$ hg cat c2
c2
@@ -425,7 +425,7 @@
$ cd b2
$ hg rebase -s 2 -d 1 --tool internal:other
- saved backup bundle to $TESTTMP/b2/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-backup.hg (glob)
$ hg cat c2
c2b
@@ -457,7 +457,7 @@
(no more unresolved files)
$ hg rebase -c --tool internal:fail
tool option will be ignored
- saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-backup.hg (glob)
$ hg rebase -i
abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit')
--- a/tests/test-rebase-pull.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-pull.t Sun Dec 07 20:04:45 2014 +0100
@@ -53,7 +53,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-backup.hg (glob)
$ hg tglog
@ 3: 'L1'
--- a/tests/test-rebase-rename.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-rename.t Sun Dec 07 20:04:45 2014 +0100
@@ -60,7 +60,7 @@
Rebase the revision containing the rename:
$ hg rebase -s 3 -d 2
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-backup.hg (glob)
$ hg tglog
@ 3: 'rename A'
@@ -150,7 +150,7 @@
Rebase the revision containing the copy:
$ hg rebase -s 3 -d 2
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-backup.hg (glob)
$ hg tglog
@ 3: 'copy A'
@@ -233,7 +233,7 @@
$ hg rebase -s 4 -d 3
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-backup.hg (glob)
$ hg diff --stat -c .
unrelated.txt | 1 +
@@ -281,7 +281,7 @@
Rebase the copies on top of the unrelated change.
$ hg rebase --source 1 --dest 4
- saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/*.hg (glob)
+ saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-backup.hg (glob)
$ hg update 4
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -305,7 +305,7 @@
$ hg rebase -s 2 --dest 5 --collapse
merging b and c to c
merging c and d to d
- saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/*.hg (glob)
+ saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-backup.hg (glob)
$ hg co tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rebase-scenario-global.t Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-scenario-global.t Sun Dec 07 20:04:45 2014 +0100
@@ -60,7 +60,7 @@
HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com>
HG: branch 'default'
HG: added D
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-backup.hg (glob)
$ hg tglog
o 7: 'D'
@@ -89,7 +89,7 @@
$ cd a2
$ HGEDITOR=cat hg rebase -s 3 -d 5
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-backup.hg (glob)
$ hg tglog
o 7: 'D'
@@ -117,7 +117,7 @@
$ cd a3
$ hg rebase -s 4 -d 7
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob)
$ hg tglog
o 6: 'E'
@@ -143,7 +143,7 @@
$ cd a4
$ hg rebase -s 5 -d 4
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-backup.hg (glob)
$ hg tglog
@ 6: 'H'
@@ -169,7 +169,7 @@
$ cd a5
$ hg rebase -s 6 -d 7
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-backup.hg (glob)
$ hg tglog
o 7: 'G'
@@ -197,7 +197,7 @@
$ cd a6
$ hg rebase -s 5 -d 1
- saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-backup.hg (glob)
$ hg tglog
@ 7: 'H'