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

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

tests: unify test-addremove-similar
tests: unify test-addremove-similar
Stefano Tortarolo - - Load All Authors

File last commit:

r11316:7fa39680 default
r11851:db955418 default
Show More
test-rebase-abort.out
69 lines | 711 B | text/plain | TextLexer
/ tests / test-rebase-abort.out
History | Source | Raw |Copy content |Copy permalink
Stefano Tortarolo
rebase: --abort doesn't strip away the target changeset (issue2220)...
 r11316
Stefano Tortarolo
Add rebase extension
 r6906 @ 4: L2
|
o 3: L1
|
| o 2: C3
|/
o 1: C2
|
o 0: C1
% Conflicting rebase
warning: conflicts during merge.
merging common failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
Matt Mackall
rebase: use helpers.sh in tests
 r11198 merging common
Stefano Tortarolo
Add rebase extension
 r6906
% Abort
Matt Mackall
Fix up rebase's handling of strip backups
 r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
 r6906 rebase aborted
@ 4: L2
|
o 3: L1
|
| o 2: C3
|/
o 1: C2
|
o 0: C1
Stefano Tortarolo
rebase: --abort doesn't strip away the target changeset (issue2220)...
 r11316
% Rebase and abort without generating new changesets
@ 4:C1
|
o 3:B bis
|
| o 2:C
| |
| o 1:B
|/
o 0:A
warning: conflicts during merge.
merging c failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
merging c
@ 4:C1
|
o 3:B bis
|
| @ 2:C
| |
| o 1:B
|/
o 0:A
rebase aborted
@ 4:C1
|
o 3:B bis
|
| o 2:C
| |
| o 1:B
|/
o 0:A