view tests/test-mq-qdelete.out @ 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 561ff8d9e4f0
children
line wrap: on
line source

adding base
abort: qdelete requires at least one revision or patch name
abort: cannot delete applied patch c
popping c
now at: b
a
b
a
b
series
status
popping b
now at: a
a
b
series
status
patch a finalized without changeset message
1 [mq]: a
0 base
abort: cannot delete revision 3 above applied patches
patch d finalized without changeset message
patch e finalized without changeset message
f
4 [mq]: f
3 [mq]: e
2 [mq]: d
1 [mq]: a
0 base
adding base
abort: no revisions specified
no patches applied
abort: revision 0 is not managed
abort: cannot delete revision 2 above applied patches
popping c
now at: b
abort: unknown revision 'c'!
applying c
patch c is empty
now at: c
patch a finalized without changeset message
patch b finalized without changeset message
c
3 imported patch c
2 [mq]: b
1 [mq]: a
0 base
patch c finalized without changeset message
3 imported patch c
2 [mq]: b
1 [mq]: a
0 base
series
status