##// 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:

r7278:45495d78 default
r8081:6c3b8132 default
Show More
test-rebase-conflicts.out
66 lines | 856 B | text/plain | TextLexer
/ tests / test-rebase-conflicts.out
History | Source | Raw |Copy content |Copy permalink
Stefano Tortarolo
Add rebase extension
 r6906 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
Stefano Tortarolo
rebase: avoid redundant merges (issue1301)
 r7278 @ 5: L3
|
o 4: L2
Stefano Tortarolo
Add rebase extension
 r6906 |
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
Stefano Tortarolo
rebase: avoid redundant merges (issue1301)
 r7278 added 3 changesets with 3 changes to 3 files
Stefano Tortarolo
Add rebase extension
 r6906 rebase completed
Stefano Tortarolo
rebase: avoid redundant merges (issue1301)
 r7278 @ 5: L3
|
o 4: L2
Stefano Tortarolo
Add rebase extension
 r6906 |
o 3: L1
|
o 2: C3
|
o 1: C2
|
o 0: C1
Stefano Tortarolo
rebase: avoid redundant merges (issue1301)
 r7278
% Check correctness
- Rev. 0
c1
- Rev. 1
c1
c2
- Rev. 2
c1
c2
c3
- Rev. 3
c1
c2
c3
- Rev. 4
resolved merge
- Rev. 5
resolved merge