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 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Tue, 18 Dec 2007 14:11:13 -0600
changeset 5664 da72b4d24797
parent 2248 b914f0557832
permissions -rwxr-xr-x
Fix income/pull with bundle and -R (issue 820). Uses ui.setconfig() to tell bundlerepo where the main repo is. This is needed for when the --repository option is used. Adds tests to test-bundle and a new test script test-mq-pull-from-bundle, which plays out the situation that initially made me detect this bug (hg -R .hg/patches pull ../bundle.hg).
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