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

r11198:b345b1cc default
r11237:feb2a58f stable
Show More
test-rebase-keep-branch.out
35 lines | 589 B | text/plain | TextLexer
/ tests / test-rebase-keep-branch.out
History | Annotation | Raw |Copy content |Copy permalink
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
marked working directory as branch notdefault
created new head
@ 4:r1:notdefault
|
| o 3:l2:
| |
| o 2:l1:
|/
o 1:c2:
|
o 0:c1:
% Rebase a branch while preserving the branch name
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
rebase completed
@ 4:r1:notdefault
|
o 3:l2:
|
o 2:l1:
|
o 1:c2:
|
o 0:c1:
% dirstate branch should be "notdefault"
notdefault