Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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 Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 27 Aug 2007 14:21:04 -0300
changeset 5242 466323968b23
parent 2248 b914f0557832
permissions -rwxr-xr-x
Avoid adding to the changelog executable files added by the second parent. This was a regression introduced by b51a8138292a.
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-crew-with-dirclash