Mercurial > hg

annotate tests/test-mq-qsave @ 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 61fcd9fac434
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2817
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
1 #!/bin/sh
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
2
2990
61fcd9fac434 Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2820
diff changeset
3 echo "[extensions]" >> $HGRCPATH
61fcd9fac434 Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2820
diff changeset
4 echo "mq=" >> $HGRCPATH
2817
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
5
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
6 hg init a
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
7 cd a
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
8
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
9 echo 'base' > base
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
10 hg ci -Ambase -d '1 0'
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
11
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
12 hg qnew -mmqbase mqbase
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
13
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
14 hg qsave
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
15 hg qrestore 2