Mercurial > hg

annotate tests/test-diff-newlines @ 3153:c82ea81d6850

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add core copy detection algorithm This adds findcopies, which detects merge-relevant copies between files in a pair of manifests back to the merge ancestor. While the merge code invokes the copy detection routine, it does not yet use the result.
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Sep 2006 16:45:31 -0500
parents b914f0557832
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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