##// END OF EJS Templates
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.

File last commit:

r9110:561ff8d9 default
r11237:feb2a58f stable
Show More
test-mq-qgoto.out
31 lines | 504 B | text/plain | TextLexer
adding a
popping c.patch
popping b.patch
now at: a.patch
applying b.patch
applying c.patch
now at: c.patch
popping c.patch
now at: b.patch
% Using index
popping b.patch
now at: a.patch
applying b.patch
applying c.patch
now at: c.patch
% No warnings when using index
popping bug141421
popping bug314159
popping c.patch
now at: b.patch
applying c.patch
applying bug314159
now at: bug314159
% Detect ambiguous non-index
patch name "14" is ambiguous:
bug314159
bug141421
abort: patch 14 not in series