--- a/tests/test-stabilize-result.t Mon Aug 20 18:59:07 2012 +0200
+++ b/tests/test-stabilize-result.t Tue Aug 21 10:10:44 2012 +0200
@@ -96,3 +96,77 @@
$ hg resolve -m a
$ hg stabilize --continue
grafting revision 5
+
+Stabilize of late comer with different parent
+==================================================
+(the with same parent is handled in test-evolve.t)
+
+ $ glog
+ @ 8:e3183e9c0961@default(draft) bk:[] newer a
+ |
+ o 7:e8cc1b534401@default(draft) bk:[changea] changea
+ |
+ o 0:07f494440405@default(draft) bk:[] adda
+
+Add another commit
+
+ $ hg gdown
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ [7] changea
+ $ echo 'c' > c
+ $ hg add c
+ $ hg commit -m 'add c'
+ created new head
+
+Get a successors of 8 on it
+
+ $ hg graft -O 8
+ grafting revision 8
+
+Add real change to the successors
+
+ $ echo 'babar' >> a
+ $ hg amend
+
+Make precursors public
+
+ $ hg phase --public 8
+ 1 new latecomers changesets
+ $ glog
+ @ 12:15c83af6f3a3@default(draft) bk:[] newer a
+ |
+ o 9:355c5cda4de1@default(draft) bk:[] add c
+ |
+ | o 8:e3183e9c0961@default(public) bk:[] newer a
+ |/
+ o 7:e8cc1b534401@default(public) bk:[changea] changea
+ |
+ o 0:07f494440405@default(public) bk:[] adda
+
+
+Stabilize !
+
+ $ hg stabilize --any --dry-run
+ recreate:[12] newer a
+ atop:[8] newer a
+ hg rebase --rev 15c83af6f3a3 --detach e8cc1b534401;
+ hg update e3183e9c0961;
+ hg revert --all --rev 15c83af6f3a3;
+ hg commit --msg "latecomer update to %s" (no-eol)
+ $ hg stabilize --any
+ recreate:[12] newer a
+ atop:[8] newer a
+ rebasing to destination parent: e8cc1b534401
+ computing new diff
+ commited as 1d94fef80e85
+ $ glog
+ @ 14:1d94fef80e85@default(draft) bk:[] latecomer update to e3183e9c0961:
+ |
+ | o 9:355c5cda4de1@default(draft) bk:[] add c
+ | |
+ o | 8:e3183e9c0961@default(public) bk:[] newer a
+ |/
+ o 7:e8cc1b534401@default(public) bk:[changea] changea
+ |
+ o 0:07f494440405@default(public) bk:[] adda
+