view tests/test-rebase-conflicts.out @ 7142:88f1b8081f1c

Prevent import over an applied patch (closes issue795)

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@  4: L2
|
o  3: L1
|
| o  2: C3
|/
o  1: C2
|
o  0: C1


% Try to call --continue
abort: no rebase in progress

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

% Try to continue without solving the conflict
abort: unresolved merge conflicts (see hg resolve)

% Conclude rebase
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
rebase completed
@  4: L2
|
o  3: L1
|
o  2: C3
|
o  1: C2
|
o  0: C1