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

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

record: check that we are not committing a merge before patch selection...
record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.
Matt Mackall - - Load All Authors

File last commit:

r11204:54e93b86 default
r11237:feb2a58f stable
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