Mercurial > hg

view tests/test-patch-offset.out @ 11346:e740f36cfb4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: rename test-merge3 to test-add-remove. It tests that 'hg commit' does not crash if the user removes a newly added file, which has nothing to do with merging.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 14 Jun 2010 13:39:00 -0400
parents 9a4034b630c4
children
line wrap: on
line source

% 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