Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-diff-newlines
author Henrik Stuart <hg@hstuart.dk>
Thu, 09 Jul 2009 20:49:02 +0200
changeset 9093 0b2b269ba3d0
parent 2248 b914f0557832
permissions -rwxr-xr-x
branch heads: fix regression introduced in e67e5b60e55f (issue1726) For merge nodes it is not adequate to only check a single possible branch head for whether it is an ancestor of the latest head, but it needs to be done for each possible branch head.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2248
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
#!/bin/sh
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 












b914f0557832
fix diffs containing embedded "\r".



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     3


hg init













b914f0557832
fix diffs containing embedded "\r".



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     4


python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a













b914f0557832
fix diffs containing embedded "\r".



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     5


hg ci -Ama -d '1 0'













b914f0557832
fix diffs containing embedded "\r".



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     6


echo clean diff >> a













b914f0557832
fix diffs containing embedded "\r".



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     7


hg ci -mb -d '2 0'













b914f0557832
fix diffs containing embedded "\r".



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     8


hg diff -r0 -r1















Mercurial