view tests/test-rebase-check-restore.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.

% - Rebasing B onto E - check keep
@  5:F:notdefault
|
| o  4:E:
| |
| o  3:D:
|/
| o  2:C:
| |
| o  1:B:
|/
o  0:A:

warning: conflicts during merge.
merging A failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
merging A

% - Solve the conflict and go on
@  7:C:
|
o  6:B:
|
| o  5:F:notdefault
| |
o |  4:E:
| |
o |  3:D:
|/
| o  2:C:
| |
| o  1:B:
|/
o  0:A:


% - Rebase F onto E - check keepbranches
@  5:F:notdefault
|
| o  4:E:
| |
| o  3:D:
|/
| o  2:C:
| |
| o  1:B:
|/
o  0:A:

warning: conflicts during merge.
merging A failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
merging A

% - Solve the conflict and go on
saved backup bundle to 
@  5:F:notdefault
|
o  4:E:
|
o  3:D:
|
| o  2:C:
| |
| o  1:B:
|/
o  0:A: