Mercurial > hg
view tests/test-diff-reverse.t @ 18954:b1639e98e8a1
record: ignore trailing content when parsing patches - introduce 'other' lines
This makes record work more like import which ignores for instance mail footers
in a patch file.
This also makes it possible for TortoiseHg to preview unapplied patches
containing such footers.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 13 Jun 2012 23:06:34 +0200 |
parents | 5a69ea8d65b3 |
children | c586cb50872b |
line wrap: on
line source
$ hg init $ cat > a <<EOF > a > b > c > EOF $ hg ci -Am adda adding a $ cat > a <<EOF > d > e > f > EOF $ hg ci -m moda $ hg diff --reverse -r0 -r1 diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +1,3 @@ -d -e -f +a +b +c $ cat >> a <<EOF > g > h > EOF $ hg diff --reverse --nodates diff -r 2855cdcfcbb7 a --- a/a +++ b/a @@ -1,5 +1,3 @@ d e f -g -h