Mercurial > hg

annotate tests/test-mq-qrename.out @ 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 05a682c8907d
children 0c944b7af564
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3083
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
1 adding base
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
2 foo/renamed
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
3 renamed
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
4 bar/renamed
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
5 renamed
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
6 baz
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
7 .hg/patches/baz
6649
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
8 % test patch being renamed before committed