tests/test-mq-qdelete.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 15 Jun 2009 00:03:26 +0200
changeset 8810 ac92775b3b80
parent 7782 140429276b63
child 8832 6e6f5b80e056
permissions -rw-r--r--
Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result.

adding base
abort: qdelete requires at least one revision or patch name
abort: cannot delete applied patch c
now at: b
a
b
a
b
series
status
now at: a
a
b
series
status
1 [mq]: a
0 base
abort: cannot delete revision 3 above applied patches
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
now at: b
abort: unknown revision 'c'!
applying c
patch c is empty
now at: c
c
3 imported patch c
2 [mq]: b
1 [mq]: a
0 base
3 imported patch c
2 [mq]: b
1 [mq]: a
0 base
series
status