Mercurial > hg

annotate tests/test-issue433 @ 9827:4fe9ca519637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1de6e7e1bb9f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3719
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
1 #!/bin/sh
8936
1de6e7e1bb9f change wiki/bts URLs to point to new hostname
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4659
diff changeset
2 # http://mercurial.selenic.com/bts/issue433
3719
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
3
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
4 hg init a
4659
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3719
diff changeset
5 cd a
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3719
diff changeset
6 echo a > a
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3719
diff changeset
7 hg commit -Ama
3719
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
8
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
9 hg parents -r 0 doesnotexist
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
10 true