facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

tests: make 'saved backup' globbing less narrow in rebase tests

Browse Source 
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).
This commit is contained in:
Mads Kiilerich 2014-12-07 20:04:45 +01:00
parent bafe4f43d9
commit b3802652b5
15 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test-bookmarks-rebase.t
View File

@ -37,7 +37,7 @@ bookmark list
rebase rebase
$ hg rebase -s two -d one $ 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 $ hg log
changeset: 3:42e5ed2cdcf4 changeset: 3:42e5ed2cdcf4

2
tests/test-rebase-abort.t
View File

@ -70,7 +70,7 @@ Conflicting rebase:
Abort: Abort:
$ hg rebase --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 rebase aborted
$ hg tglog $ hg tglog

8
tests/test-rebase-bookmarks.t
View File

@ -74,7 +74,7 @@ Test deleting divergent bookmarks from dest (issue3685)
o 0: 'A' bookmarks: Y@diverge o 0: 'A' bookmarks: Y@diverge
$ hg rebase -s Y -d 3 $ 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 $ hg tglog
@ 3: 'C' bookmarks: Y Z @ 3: 'C' bookmarks: Y Z
@ -95,7 +95,7 @@ Do not try to keep active but deleted divergent bookmark
$ hg book W@diverge $ hg book W@diverge
$ hg rebase -s W -d . $ 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 $ hg bookmarks
W 3:0d3554f74897 W 3:0d3554f74897
@ -112,7 +112,7 @@ Keep bookmarks to the correct rebased changeset
$ hg up -q Z $ hg up -q Z
$ hg rebase -s 1 -d 3 $ 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 $ hg tglog
@ 3: 'C' bookmarks: Y Z @ 3: 'C' bookmarks: Y Z
@ -133,7 +133,7 @@ Keep active bookmark on the correct changeset
$ hg up -q X $ hg up -q X
$ hg rebase -d W $ 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 $ hg tglog
o 3: 'C' bookmarks: Y Z o 3: 'C' bookmarks: Y Z

16
tests/test-rebase-cache.t
View File

@ -105,7 +105,7 @@ Rebase part of branch2 (5-6) onto branch3 (8):
0: 'A' 0: 'A'
$ hg rebase -s 5 -d 8 $ 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 $ hg branches
branch3 8:466cdfb14b62 branch3 8:466cdfb14b62
@ -166,7 +166,7 @@ Rebase head of branch3 (8) onto branch2 (6):
o 0: 'A' o 0: 'A'
$ hg rebase -s 8 -d 6 $ 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 $ hg branches
branch2 8:6b4bdc1b5ac0 branch2 8:6b4bdc1b5ac0
@ -230,7 +230,7 @@ Rebase entire branch3 (7-8) onto branch2 (6):
o 0: 'A' o 0: 'A'
$ hg rebase -s 7 -d 6 $ 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 $ hg branches
branch2 7:6b4bdc1b5ac0 branch2 7:6b4bdc1b5ac0
@ -267,7 +267,7 @@ update the branch cache.
$ hg strip 2 $ hg strip 2
0 files updated, 0 files merged, 4 files removed, 0 files unresolved 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 $ hg tglog
o 3: 'C' branch2 o 3: 'C' branch2
@ -328,7 +328,7 @@ the same as branches remaining.
$ hg strip 2 $ hg strip 2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 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 $ hg theads
1: 'branch2' branch2 1: 'branch2' branch2
@ -373,14 +373,14 @@ Try both orders.
$ hg strip 3 4 $ hg strip 3 4
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 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 $ hg theads
2: 'C' 2: 'C'
$ hg strip 2 1 $ hg strip 2 1
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 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 $ hg theads
0: 'A' 0: 'A'
@ -477,4 +477,4 @@ Turn most changeset public
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e
HGEDITFORM=rebase.merge HGEDITFORM=rebase.merge
HGEDITFORM=rebase.normal 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)

2
tests/test-rebase-check-restore.t
View File

@ -132,7 +132,7 @@ Solve the conflict and go on:
$ hg resolve -m A $ hg resolve -m A
(no more unresolved files) (no more unresolved files)
$ hg rebase --continue $ 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 $ hg tglog
@ 5:draft 'F' notdefault @ 5:draft 'F' notdefault

22
tests/test-rebase-collapse.t
View File

@ -75,7 +75,7 @@ Rebasing B onto H and collapsing changesets with different phases:
HG: added C HG: added C
HG: added D 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 $ hg tglogp
@ 5:secret 'Collapsed revision @ 5:secret 'Collapsed revision
@ -113,7 +113,7 @@ Rebasing E onto H:
$ hg phase --force --secret 6 $ hg phase --force --secret 6
$ hg rebase --source 4 --collapse $ 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 $ hg tglog
o 6: 'Collapsed revision o 6: 'Collapsed revision
@ -154,7 +154,7 @@ Rebasing G onto H with custom message:
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e
HGEDITFORM=rebase.collapse 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 $ hg tglog
o 6: 'custom message' o 6: 'custom message'
@ -261,7 +261,7 @@ Rebase and collapse - more than one external (fail):
Rebase and collapse - E onto H: Rebase and collapse - E onto H:
$ hg rebase -s 4 --collapse # root (4) is not a merge $ 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 $ hg tglog
o 5: 'Collapsed revision o 5: 'Collapsed revision
@ -410,7 +410,7 @@ Rebase and collapse - E onto I:
$ hg rebase -s 4 --collapse # root (4) is not a merge $ hg rebase -s 4 --collapse # root (4) is not a merge
merging E 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 $ hg tglog
o 5: 'Collapsed revision o 5: 'Collapsed revision
@ -499,7 +499,7 @@ Rebase and collapse - B onto F:
$ cd d1 $ cd d1
$ hg rebase -s 1 --collapse $ 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 $ hg tglog
o 2: 'Collapsed revision o 2: 'Collapsed revision
@ -583,7 +583,7 @@ Interactions between collapse and keepbranches
o 0: 'A' o 0: 'A'
$ hg rebase -s 5 -d 4 $ 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 $ hg tglog
@ 4: 'E' @ 4: 'E'
| |
@ -639,7 +639,7 @@ Rebase, collapse and copies
merging c and f to f merging c and f to f
merging f and c to c merging f and c to c
merging e and g to g 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
$ hg st --copies --change tip $ hg st --copies --change tip
A d A d
@ -678,7 +678,7 @@ Test collapsing a middle revision in-place
Test collapsing in place Test collapsing in place
$ hg rebase --collapse -b . -d 0 $ 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 $ hg st --change tip --copies
M a M a
M c M c
@ -737,7 +737,7 @@ Test stripping a revision with another child
$ hg strip 2 $ hg strip 2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 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 $ hg tglog
o 1: 'B' o 1: 'B'
@ -768,7 +768,7 @@ Test collapsing changes that add then remove a file
adding b adding b
$ hg book foo $ hg book foo
$ hg rebase -d 0 -r "1::2" --collapse -m collapsed $ 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}" $ hg log -G --template "{rev}: '{desc}' {bookmarks}"
@ 1: 'collapsed' foo @ 1: 'collapsed' foo
| |

2
tests/test-rebase-conflicts.t
View File

@ -79,7 +79,7 @@ Conclude rebase:
$ hg resolve -m common $ hg resolve -m common
(no more unresolved files) (no more unresolved files)
$ hg rebase --continue $ 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 $ hg tglog
@ 5:secret 'L3' mybook @ 5:secret 'L3' mybook

12
tests/test-rebase-detach.t
View File

@ -48,7 +48,7 @@ Rebasing D onto H detaching from C:
$ hg phase --force --secret 3 $ hg phase --force --secret 3
$ hg rebase -s 3 -d 7 $ 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" $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 7:secret 'D' o 7:secret 'D'
@ -99,7 +99,7 @@ Rebasing C onto H detaching from B:
o 0: 'A' o 0: 'A'
$ hg rebase -s 2 -d 7 $ 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 $ hg tglog
o 7: 'D' o 7: 'D'
@ -151,7 +151,7 @@ Rebasing B onto H using detach (same as not using it):
o 0: 'A' o 0: 'A'
$ hg rebase -s 1 -d 7 $ 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 $ hg tglog
o 7: 'D' o 7: 'D'
@ -205,7 +205,7 @@ Rebasing C onto H detaching from B and collapsing:
o 0: 'A' o 0: 'A'
$ hg rebase --collapse -s 2 -d 7 $ 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" $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 6:secret 'Collapsed revision o 6:secret 'Collapsed revision
@ -264,7 +264,7 @@ Rebasing across null as ancestor
o 0: 'A' o 0: 'A'
$ hg rebase -s 1 -d tip $ 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 $ hg tglog
o 8: 'D' o 8: 'D'
@ -325,7 +325,7 @@ Verify that target is not selected as external rev (issue3085)
$ hg ci -m "J" $ hg ci -m "J"
$ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other $ 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 $ hg tglog
@ 8: 'Collapsed revision @ 8: 'Collapsed revision

4
tests/test-rebase-issue-noparam-single-rev.t
View File

@ -52,7 +52,7 @@ Rebase with no arguments - single revision in source branch:
$ hg up -q -C 2 $ hg up -q -C 2
$ hg rebase $ 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 $ hg tglog
@ 4: 'l1' @ 4: 'l1'
@ -110,7 +110,7 @@ Rebase with no arguments - single revision in target branch:
$ hg up -q -C 3 $ hg up -q -C 3
$ hg rebase $ 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 $ hg tglog
@ 4: 'l2' @ 4: 'l2'

14
tests/test-rebase-named-branches.t
View File

@ -69,7 +69,7 @@
Branch name containing a dash (issue3181) Branch name containing a dash (issue3181)
$ hg rebase -b dev-two -d dev-one --keepbranches $ 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 $ hg tglog
@ 9: 'dev-two named branch' dev-two @ 9: 'dev-two named branch' dev-two
@ -93,7 +93,7 @@ Branch name containing a dash (issue3181)
o 0: 'A' o 0: 'A'
$ hg rebase -s dev-one -d 0 --keepbranches $ 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 $ hg tglog
@ 8: 'dev-two named branch' dev-two @ 8: 'dev-two named branch' dev-two
@ -143,7 +143,7 @@ Branch name containing a dash (issue3181)
o 0: 'A' o 0: 'A'
$ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches $ 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 $ hg tglog
o 9: 'dev-two named branch' dev-two o 9: 'dev-two named branch' dev-two
@ -167,7 +167,7 @@ Branch name containing a dash (issue3181)
o 0: 'A' o 0: 'A'
$ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches $ 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 $ hg tglog
o 8: 'dev-two named branch' dev-two o 8: 'dev-two named branch' dev-two
@ -192,7 +192,7 @@ Branch name containing a dash (issue3181)
Rebasing descendant onto ancestor across different named branches Rebasing descendant onto ancestor across different named branches
$ hg rebase -s 1 -d 8 --keepbranches $ 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 $ hg tglog
o 8: 'D' o 8: 'D'
@ -218,7 +218,7 @@ Rebasing descendant onto ancestor across different named branches
[255] [255]
$ hg rebase -s 5 -d 4 $ 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 $ hg tglog
o 8: 'D' o 8: 'D'
@ -248,7 +248,7 @@ Reopen branch by rebase
$ hg ci -m 'close b' --close $ hg ci -m 'close b' --close
$ hg rebase -b 8 -d b $ hg rebase -b 8 -d b
reopening closed branch head ea9de14a36c6 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 .. $ cd ..

2
tests/test-rebase-newancestor.t
View File

@ -40,7 +40,7 @@
$ hg rebase -s 1 -d 3 $ hg rebase -s 1 -d 3
merging a merging a
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 $ hg tglog
o 3: 'C' o 3: 'C'

24
tests/test-rebase-parameters.t
View File

@ -120,7 +120,7 @@ Rebase with no arguments (from 3 onto 8):
$ hg up -q -C 3 $ hg up -q -C 3
$ hg rebase $ 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 $ hg tglog
@ 8: 'D' @ 8: 'D'
@ -155,7 +155,7 @@ Rebase with base == '.' => same as no arguments (from 3 onto 8):
$ cd a2 $ cd a2
$ hg rebase --base . $ 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 $ hg tglog
@ 8: 'D' @ 8: 'D'
@ -185,7 +185,7 @@ Rebase with dest == branch(.) => same as no arguments (from 3 onto 8):
$ cd a3 $ cd a3
$ hg rebase --dest 'branch(.)' $ 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 $ hg tglog
@ 8: 'D' @ 8: 'D'
@ -215,7 +215,7 @@ Specify only source (from 2 onto 8):
$ cd a4 $ cd a4
$ hg rebase --source 'desc("C")' $ 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 $ hg tglog
o 8: 'D' o 8: 'D'
@ -245,7 +245,7 @@ Specify only dest (from 3 onto 6):
$ cd a5 $ cd a5
$ hg rebase --dest 6 $ 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 $ hg tglog
@ 8: 'D' @ 8: 'D'
@ -275,7 +275,7 @@ Specify only base (from 1 onto 8):
$ cd a6 $ cd a6
$ hg rebase --base 'desc("D")' $ 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 $ hg tglog
o 8: 'D' o 8: 'D'
@ -305,7 +305,7 @@ Specify source and dest (from 2 onto 7):
$ cd a7 $ cd a7
$ hg rebase --source 2 --dest 7 $ 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 $ hg tglog
o 8: 'D' o 8: 'D'
@ -335,7 +335,7 @@ Specify base and dest (from 1 onto 7):
$ cd a8 $ cd a8
$ hg rebase --base 3 --dest 7 $ 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 $ hg tglog
o 8: 'D' o 8: 'D'
@ -365,7 +365,7 @@ Specify only revs (from 2 onto 8)
$ cd a9 $ cd a9
$ hg rebase --rev 'desc("C")::' $ 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 $ hg tglog
o 8: 'D' o 8: 'D'
@ -413,7 +413,7 @@ Test --tool parameter:
$ cd b1 $ cd b1
$ hg rebase -s 2 -d 1 --tool internal:local $ 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 $ hg cat c2
c2 c2
@ -425,7 +425,7 @@ Test --tool parameter:
$ cd b2 $ cd b2
$ hg rebase -s 2 -d 1 --tool internal:other $ 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 $ hg cat c2
c2b c2b
@ -457,7 +457,7 @@ Test --tool parameter:
(no more unresolved files) (no more unresolved files)
$ hg rebase -c --tool internal:fail $ hg rebase -c --tool internal:fail
tool option will be ignored 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 $ hg rebase -i
abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit') abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit')

2
tests/test-rebase-pull.t
View File

@ -53,7 +53,7 @@ Now b has one revision to be pulled from a:
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) 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 $ hg tglog
@ 3: 'L1' @ 3: 'L1'

10
tests/test-rebase-rename.t
View File

@ -60,7 +60,7 @@ Rename is tracked:
Rebase the revision containing the rename: Rebase the revision containing the rename:
$ hg rebase -s 3 -d 2 $ 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 $ hg tglog
@ 3: 'rename A' @ 3: 'rename A'
@ -150,7 +150,7 @@ Copy is tracked:
Rebase the revision containing the copy: Rebase the revision containing the copy:
$ hg rebase -s 3 -d 2 $ 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 $ hg tglog
@ 3: 'copy A' @ 3: 'copy A'
@ -233,7 +233,7 @@ Test rebase across repeating renames:
$ hg rebase -s 4 -d 3 $ 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 . $ hg diff --stat -c .
unrelated.txt | 1 + unrelated.txt | 1 +
@ -281,7 +281,7 @@ Update back to before we performed copies, and inject an unrelated change.
Rebase the copies on top of the unrelated change. Rebase the copies on top of the unrelated change.
$ hg rebase --source 1 --dest 4 $ 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 $ hg update 4
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -305,7 +305,7 @@ copy records collapse correctly.
$ hg rebase -s 2 --dest 5 --collapse $ hg rebase -s 2 --dest 5 --collapse
merging b and c to c merging b and c to c
merging c and d to d 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 $ hg co tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved

12
tests/test-rebase-scenario-global.t
View File

@ -60,7 +60,7 @@ D onto H - simple rebase:
HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com> HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com>
HG: branch 'default' HG: branch 'default'
HG: added D 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 $ hg tglog
o 7: 'D' o 7: 'D'
@ -89,7 +89,7 @@ D onto F - intermediate point:
$ cd a2 $ cd a2
$ HGEDITOR=cat hg rebase -s 3 -d 5 $ 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 $ hg tglog
o 7: 'D' o 7: 'D'
@ -117,7 +117,7 @@ E onto H - skip of G:
$ cd a3 $ cd a3
$ hg rebase -s 4 -d 7 $ 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 $ hg tglog
o 6: 'E' o 6: 'E'
@ -143,7 +143,7 @@ F onto E - rebase of a branching point (skip G):
$ cd a4 $ cd a4
$ hg rebase -s 5 -d 4 $ 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 $ hg tglog
@ 6: 'H' @ 6: 'H'
@ -169,7 +169,7 @@ G onto H - merged revision having a parent in ancestors of target:
$ cd a5 $ cd a5
$ hg rebase -s 6 -d 7 $ 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 $ hg tglog
o 7: 'G' o 7: 'G'
@ -197,7 +197,7 @@ F onto B - G maintains E as parent:
$ cd a6 $ cd a6
$ hg rebase -s 5 -d 1 $ 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 $ hg tglog
@ 7: 'H' @ 7: 'H'