annotate tests/test-paths @ 9827:4fe9ca519637

mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 11 Nov 2009 18:31:42 +0100
parents 92eb0a019bf2
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5943
ffaf2419de44 Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff changeset
1 #!/bin/sh
ffaf2419de44 Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff changeset
2 hg init a
ffaf2419de44 Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff changeset
3 hg clone a b
ffaf2419de44 Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff changeset
4 cd a
ffaf2419de44 Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff changeset
5 echo '[paths]' >> .hg/hgrc
ffaf2419de44 Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff changeset
6 echo 'dupe = ../b' >> .hg/hgrc
5951
92eb0a019bf2 Simplify test-paths
Bryan O'Sullivan <bos@serpentine.com>
parents: 5943
diff changeset
7 hg in dupe | fgrep '../'
5943
ffaf2419de44 Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff changeset
8 cd ..
5951
92eb0a019bf2 Simplify test-paths
Bryan O'Sullivan <bos@serpentine.com>
parents: 5943
diff changeset
9 hg -R a in dupe | fgrep '../'
5943
ffaf2419de44 Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff changeset
10 true