[PATCH] patch to add --print0 option to hg resolve (issue2532)

[Mads Kiilerich]

On 12/02/2010 08:03 PM, Haszlakiewicz, Eric wrote:
>> A test could be nice. The other --print0 options are also not tested,
>> but that is a bad excuse. See WritingTests. run-tests.py should
>> automagically escape the output and show the zeros.
>
> I don't think I have the time to put together a test right now.  Sorry.

diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -25,6 +25,12 @@
    0 files updated, 0 files merged, 0 files removed, 1 files unresolved
    use 'hg resolve' to retry unresolved file merges or 'hg update -C .' 
to abandon
    [1]
+  $ hg resolve -l
+  U file
+  $ hg resolve -ln
+  file
+  $ hg resolve -ln0
+  file\x00 (no-eol) (esc)

    $ echo resolved > file
    $ hg resolve -m file

(untested)

/Mads