##// 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.
Greg Onufer - - Load All Authors

File last commit:

r10135:9a4034b6 stable
r11237:feb2a58f stable
Show More
test-patch-offset.out
10 lines | 263 B | text/plain | TextLexer
/ tests / test-patch-offset.out
History | Annotation | Raw |Copy content |Copy permalink
% prepare repo
adding a
% import patch
applying patch from stdin
patching file a
Hunk #1 succeeded at 43 (offset 34 lines).
Hunk #2 succeeded at 87 (offset 34 lines).
Hunk #3 succeeded at 109 (offset 34 lines).
a
% compare imported changes against reference file