Mercurial > hg
annotate tests/test-convert-bzr-ghosts @ 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 | 9e6d6568bf7a |
children |
rev | line source |
---|---|
7053 | 1 #!/bin/sh |
2 | |
7058
9e6d6568bf7a
`source` doesn't work for some /bin/sh, use `.` instead
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7053
diff
changeset
|
3 . "$TESTDIR/bzr-definitions" |
7053 | 4 |
5 cat > ghostcreator.py <<EOF | |
6 import sys | |
7 from bzrlib import workingtree | |
8 wt = workingtree.WorkingTree.open('.') | |
9 | |
10 message, ghostrev = sys.argv[1:] | |
11 wt.set_parent_ids(wt.get_parent_ids() + [ghostrev]) | |
12 wt.commit(message) | |
13 EOF | |
14 | |
15 echo % ghost revisions | |
16 mkdir test-ghost-revisions | |
17 cd test-ghost-revisions | |
18 bzr init -q source | |
19 cd source | |
20 echo content > somefile | |
21 bzr add -q somefile | |
22 bzr commit -q -m 'Initial layout setup' | |
23 echo morecontent >> somefile | |
24 python ../../ghostcreator.py 'Commit with ghost revision' ghostrev | |
25 cd .. | |
26 hg convert source source-hg | |
27 glog -R source-hg |