##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

issue1577: fix broken test by assuming less about CVS output....
issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".
Stefano Tortarolo - - Load All Authors

File last commit:

r6906:808f03f6 default
r8081:6c3b8132 default
Show More
test-rebase-interruptions.out
113 lines | 1.4 KiB | text/plain | TextLexer
/ tests / test-rebase-interruptions.out
History | Annotation | Raw |Copy content |Copy permalink
% Changes during an interruption - continue
@ 4: E
|
o 3: D
|
| o 2: C
| |
| o 1: B
|/
o 0: A
% - Rebasing B onto E
merging A
warning: conflicts during merge.
merging A failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
% - 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
rebase completed
@ 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
merging A
warning: conflicts during merge.
merging A failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
% 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, not stripping
@ 6: Extra
|
o 5: B
|
o 4: E
|
o 3: D
|
| o 2: C
| |
| o 1: B
|/
o 0: A