Mercurial > hg
view tests/test-rebase-interruptions.out @ 12403:ba8850911703
test-serve: fix test for binding to low named port on solaris
Solaris do not know the service called http, so we use echo instead.
Trying to define KILLQUIETLY when running the hgserve function didn't set the
value within the function. Now we set the variable before calling the function.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sat, 25 Sep 2010 02:35:32 +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