Mercurial > hg
view tests/test-rebase-interruptions.out @ 12371:48a4acd1ccf1
templater: add hex filter.
author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
---|---|
date | Wed, 22 Sep 2010 00:14:57 +0200 |
parents | 54e93b86a9e3 |
children |
line wrap: on
line source
% Changes during an interruption - continue @ 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % - Rebasing B onto E warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue merging A % - Force a commit on C during the interruption 1 files updated, 0 files merged, 1 files removed, 0 files unresolved @ 6: Extra | | o 5: B | | | o 4: E | | | o 3: D | | o | 2: C | | o | 1: B |/ o 0: A % - Resume the rebasing merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Solve the conflict and go on warning: new changesets detected on source branch, not stripping @ 7: C | | o 6: Extra | | o | 5: B | | o | 4: E | | o | 3: D | | | o 2: C | | | o 1: B |/ o 0: A % Changes during an interruption - abort @ 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % Rebasing B onto E warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue merging A % Force a commit on B' during the interruption 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @ 6: Extra | o 5: B | o 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % Abort the rebasing warning: new changesets detected on target branch, can't abort @ 6: Extra | o 5: B | o 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A