tests/test-rebase-abort.out
author Patrick Mezard <pmezard@gmail.com>
Thu, 21 Jan 2010 15:13:40 +0100
changeset 10272 886858b834da
parent 6906 808f03f61ebe
child 11198 b345b1cc124f
permissions -rw-r--r--
subrepo: svn xml output is much easier to parse That's especially true with status flags: there are different fields and values for regular changes, meta changes, externals changes and externals meta changes.

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


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

% Abort
rebase aborted
@  4: L2
|
o  3: L1
|
| o  2: C3
|/
o  1: C2
|
o  0: C1