--- a/tests/test-rebase-check-restore.t Wed Jan 18 11:33:14 2012 +0100
+++ b/tests/test-rebase-check-restore.t Tue Jan 17 09:12:14 2012 +0100
@@ -7,7 +7,7 @@
> publish=False
>
> [alias]
- > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
+ > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
> EOF
@@ -46,23 +46,24 @@
$ cd ..
-Rebasing B onto E - check keep:
+Rebasing B onto E - check keep: and phases
$ hg clone -q -u . a a1
$ cd a1
+ $ hg phase --force --secret 2
$ hg tglog
- @ 5: 'F' notdefault
+ @ 5:draft 'F' notdefault
|
- | o 4: 'E'
+ | o 4:draft 'E'
| |
- | o 3: 'D'
+ | o 3:draft 'D'
|/
- | o 2: 'C'
+ | o 2:secret 'C'
| |
- | o 1: 'B'
+ | o 1:draft 'B'
|/
- o 0: 'A'
+ o 0:draft 'A'
$ hg rebase -s 1 -d 4 --keep
merging A
@@ -79,21 +80,21 @@
$ hg rebase --continue
$ hg tglog
- @ 7: 'C'
+ @ 7:secret 'C'
|
- o 6: 'B'
+ o 6:draft 'B'
|
- | o 5: 'F' notdefault
+ | o 5:draft 'F' notdefault
| |
- o | 4: 'E'
+ o | 4:draft 'E'
| |
- o | 3: 'D'
+ o | 3:draft 'D'
|/
- | o 2: 'C'
+ | o 2:secret 'C'
| |
- | o 1: 'B'
+ | o 1:draft 'B'
|/
- o 0: 'A'
+ o 0:draft 'A'
$ cd ..
@@ -102,19 +103,20 @@
$ hg clone -q -u . a a2
$ cd a2
+ $ hg phase --force --secret 2
$ hg tglog
- @ 5: 'F' notdefault
+ @ 5:draft 'F' notdefault
|
- | o 4: 'E'
+ | o 4:draft 'E'
| |
- | o 3: 'D'
+ | o 3:draft 'D'
|/
- | o 2: 'C'
+ | o 2:secret 'C'
| |
- | o 1: 'B'
+ | o 1:draft 'B'
|/
- o 0: 'A'
+ o 0:draft 'A'
$ hg rebase -s 5 -d 4 --keepbranches
merging A
@@ -132,15 +134,15 @@
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
- @ 5: 'F' notdefault
+ @ 5:draft 'F' notdefault
|
- o 4: 'E'
+ o 4:draft 'E'
|
- o 3: 'D'
+ o 3:draft 'D'
|
- | o 2: 'C'
+ | o 2:secret 'C'
| |
- | o 1: 'B'
+ | o 1:draft 'B'
|/
- o 0: 'A'
+ o 0:draft 'A'