Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 28188:6411140aeda9
rebase: add potential divergent commit hashes to error message (issue5086)
author | Kostia Balytskyi <ikostia@fb.com> |
---|---|
date | Wed, 17 Feb 2016 20:31:34 +0000 |
parents | bb14a81ce647 |
children | dc6032a1d888 |
comparison
equal
deleted
inserted
replaced
28187:d3da97e58d42 | 28188:6411140aeda9 |
---|---|
769 commit: (clean) | 769 commit: (clean) |
770 update: 2 new changesets, 3 branch heads (merge) | 770 update: 2 new changesets, 3 branch heads (merge) |
771 phases: 8 draft | 771 phases: 8 draft |
772 unstable: 1 changesets | 772 unstable: 1 changesets |
773 $ hg rebase -s 10 -d 12 | 773 $ hg rebase -s 10 -d 12 |
774 abort: this rebase will cause divergence | 774 abort: this rebase will cause divergences from: 121d9e3bc4c6 |
775 (to force the rebase please set rebase.allowdivergence=True) | 775 (to force the rebase please set rebase.allowdivergence=True) |
776 [255] | 776 [255] |
777 $ hg log -G | 777 $ hg log -G |
778 @ 15:73568ab6879d bar foo | 778 @ 15:73568ab6879d bar foo |
779 | | 779 | |