--- a/tests/test-evolve.t Sat Aug 04 12:44:51 2012 +0200
+++ b/tests/test-evolve.t Sun Aug 05 12:02:45 2012 +0200
@@ -54,6 +54,15 @@
1 - 7c3bad9141dc add b (public)
0 - 1f0dee641bb7 add a (public)
+test kill and immutable changeset
+
+ $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
+ 1 public stable
+ $ hg kill 1
+ cannot kill immutable changeset 7c3bad9141dc
+ $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
+ 1 public stable
+
test simple kill
$ hg id -n
@@ -356,6 +365,7 @@
(run 'hg update' to get a working copy)
$ hg up
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
$ cd ..
Test graft --obsolete/--old-obsolete
@@ -402,5 +412,51 @@
$ hg debugsuccessors
0e84df4912da 0b9e50c35132
db038628b9e5 acb28cd497b7
+
+Test graft --continue
+
+ $ hg up -qC 0
+ $ echo 2 > 1
+ $ hg ci -Am conflict 1
+ created new head
+ $ hg up -qC 6
+ $ hg graft -O 7
+ grafting revision 7
+ merging 1
+ warning: conflicts during merge.
+ merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+ abort: unresolved conflicts, can't continue
+ (use hg resolve and hg graft --continue)
+ [255]
+ $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
+ 7:a5bfd90a2f29 stable
+ $ echo 3 > 1
+ $ hg resolve -m 1
+ $ hg graft --continue -O
+ grafting revision 7
+ $ glog --hidden
+ @ 8:920e58bb443b@default(draft) conflict
+ |
+ | x 7:a5bfd90a2f29@default(draft) conflict
+ | |
+ o | 6:acb28cd497b7@default(draft) add 1
+ | |
+ o | 5:0b9e50c35132@default(draft) add 3
+ | |
+ o | 4:ce341209337f@default(draft) add 4
+ |/
+ | x 3:0e84df4912da@default(draft) add 3
+ | |
+ | x 2:db038628b9e5@default(draft) add 2
+ | |
+ | o 1:73d38bb17fd7@default(draft) add 1
+ |/
+ o 0:8685c6d34325@default(draft) add 0
+
+ $ hg debugsuccessors
+ 0e84df4912da 0b9e50c35132
+ a5bfd90a2f29 920e58bb443b
+ db038628b9e5 acb28cd497b7
+
$ cd ..