Mercurial > hg

annotate tests/test-patch-offset.out @ 10190:9c2c94934f0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: upgrade to git patch when necessary (issue767)
author Patrick Mezard <pmezard@gmail.com>
date Fri, 01 Jan 2010 21:21:34 +0100
parents 9a4034b630c4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10135
9a4034b630c4 patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
diff changeset
1 % prepare repo
9a4034b630c4 patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
diff changeset
2 adding a
9a4034b630c4 patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
diff changeset
3 % import patch
9a4034b630c4 patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
diff changeset
4 applying patch from stdin
9a4034b630c4 patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
diff changeset
5 patching file a
9a4034b630c4 patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
diff changeset
6 Hunk #1 succeeded at 43 (offset 34 lines).
9a4034b630c4 patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
diff changeset
7 Hunk #2 succeeded at 87 (offset 34 lines).
9a4034b630c4 patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
diff changeset
8 Hunk #3 succeeded at 109 (offset 34 lines).
9a4034b630c4 patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
diff changeset
9 a
9a4034b630c4 patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
diff changeset
10 % compare imported changes against reference file