Comments
Patch
@@ -949,3 +949,51 @@ Check that bookmark was moved to rev 3 a
during the rebase operation
$ hg bookmarks
mybook 3:be1832deae9a
+
+ $ cd ..
+ $ hg init divergence-test
+ $ cd divergence-test
+ $ echo this is alpha >> alpha
+ $ hg addr
+ adding alpha
+ $ hg ci -m alpha
+ $ echo this is beta >> beta
+ $ hg addr
+ adding beta
+ $ hg ci -m beta
+ $ echo this is gamma >> gamma
+ $ hg addr
+ adding gamma
+ $ hg ci -m gamma
+ $ hg tag --local orig-gamma
+ $ echo narf >> gamma
+ $ hg ci --amend -m narfed
+ $ hg co 0
+ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+ $ echo this is delta >> delta
+ $ hg addr
+ adding delta
+ $ hg ci -m delta
+ created new head
+ $ hg co -r 'grep(narfed)'
+ 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ hg log -G --style compact
+ o 5[tip]:0 548ea510abf2 1970-01-01 00:00 +0000 test
+ | delta
+ |
+ | @ 4:1 81c57aa70614 1970-01-01 00:00 +0000 test
+ | | narfed
+ | |
+ | | x 2[orig-gamma] 0d06e1c65cf7 1970-01-01 00:00 +0000 test
+ | |/ gamma
+ | |
+ | o 1 1444e26bd91c 1970-01-01 00:00 +0000 test
+ |/ beta
+ |
+ o 0 26777fe7b819 1970-01-01 00:00 +0000 test
+ alpha
+
+This shouldn't cause divergence, because we're not interested in
+rebasing the obsolete-but-not-hidden revision locally tagged by
+'orig-gamma'.
+ $ hg rebase -d tip