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

r11203:7a9cf012 default
r11237:feb2a58f stable
Show More
test-rebase-detach.out
134 lines | 1.4 KiB | text/plain | TextLexer
/ tests / test-rebase-detach.out
History | Annotation | Raw |Copy content |Copy permalink
@ 4: E
|
| o 3: D
| |
| o 2: C
| |
| o 1: B
|/
o 0: A
% Rebasing D onto E detaching from C
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
rebase completed
@ 4: D
|
o 3: E
|
| o 2: C
| |
| o 1: B
|/
o 0: A
Expected A, D, E
A
D
E
@ 4: E
|
| o 3: D
| |
| o 2: C
| |
| o 1: B
|/
o 0: A
% Rebasing C onto E detaching from B
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
rebase completed
@ 4: D
|
o 3: C
|
o 2: E
|
| o 1: B
|/
o 0: A
Expected A, C, D, E
A
C
D
E
@ 4: E
|
| o 3: D
| |
| o 2: C
| |
| o 1: B
|/
o 0: A
% Rebasing B onto E using detach (same as not using it)
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
rebase completed
@ 4: D
|
o 3: C
|
o 2: B
|
o 1: E
|
o 0: A
Expected A, B, C, D, E
A
B
C
D
E
@ 4: E
|
| o 3: D
| |
| o 2: C
| |
| o 1: B
|/
o 0: A
% Rebasing C onto E detaching from B and collapsing
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files (+1 heads)
rebase completed
@ 3: Collapsed revision
| * C
| * D
o 2: E
|
| o 1: B
|/
o 0: A
Expected A, C, D, E
A
C
D
E