[issue2041] mq rejects quilt patches for new files

timeless bugs at mercurial.selenic.com
Sun Feb 14 10:32:22 CST 2010


New submission from timeless <timeless at gmail.com>:

we have a CVS+quilt workflow which migrated to hg as a hg+quilt workflow. in
theory i should be able to take my .patches directory from quilt and convert
it into a mq .hg/patches directory, i did this, and it mostly worked, except
for one hitch: new files. Attached is my reduced testcase based on the quilt
managed patch that failed.

timeless-mbp-2:qtest timeless$ hg qpop; hg qpush
popping a
patch queue now empty
applying a
unable to find 'a' for patching
1 out of 1 hunks FAILED -- saving rejects to file a.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh a
timeless-mbp-2:qtest timeless$ cat .hg/patches/a
--- foo/a.orig	2010-01-29 21:45:58.996136662 -0700
+++ foo/a	2010-02-12 06:33:45.000000000 -0700
@@ -0,0 +1,2 @@
+hello
+world
timeless-mbp-2:qtest timeless$ patch -p1 < .hg/patches/a
patching file a

----------
files: a
messages: 11699
nosy: timeless
priority: bug
status: unread
title: mq rejects quilt patches for new files

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2041>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: a
Type: application/octet-stream
Size: 127 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100214/aa62a1b6/attachment.obj>


More information about the Mercurial-devel mailing list