Mercurial > hg
view tests/test-revlog-ancestry.py.out @ 27746:f0e9f38d250f
rebase: prevent creating divergence
Before this patch rebase would create divergence when you were rebasing obsolete
changesets on a destination not containing one of its successors.
This patch introduces rebase.allowdivergence to explicitly allow
divergence creation with rebase.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Tue, 12 Jan 2016 13:43:41 -0800 |
parents | f88c60e740a1 |
children | b6db2e80a9ce |
line wrap: on
line source
Ancestors of 5 4 2 0 Ancestors of 6 and 5 3 4 2 1 0 Ancestors of 5 and 4 4 2 0 Ancestors of 7, stop at 6 6 Ancestors of 7, including revs 7 6 5 3 4 2 1 0 Ancestors of 7, 5 and 3, including revs 7 5 3 6 4 2 1 0 Descendants of 5 7 8 Descendants of 5 and 3 6 7 8 Descendants of 5 and 4 5 7 8