Mercurial > hg
diff tests/test-rebase-conflicts.out @ 6906:808f03f61ebe
Add rebase extension
author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
---|---|
date | Mon, 18 Aug 2008 21:16:31 +0200 |
parents | |
children | 45495d784ad6 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-rebase-conflicts.out Mon Aug 18 21:16:31 2008 +0200 @@ -0,0 +1,43 @@ +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 +