[issue691] mq cant inport patches from svn

AlexRayne mercurial-bugs at selenic.com
Thu Aug 16 11:19:11 CDT 2007


New submission from AlexRayne <AlexRainPE196 at newmail.ru>:

Hallow all!
i`ve try to hg qimport some patch produced by svn.
when try to hg qpush it reported that patch cant found files to merge to.
the cause is that hg use prefix a/, b/ for differenced files, but svn
when produce unified diff stay this names unprefixed.
IMHO useful to allow patch work with unified diffs.

here example:
this patch imported from svn

Index: D:/Program Files/Borland/FBDataset.hg/FBCustomDataSet.pas
===================================================================
--- FBCustomDataSet.pas	(revision 82)
+++ FBCustomDataSet.pas	(revision 83)
@@ -162,7 +162,6 @@
     FDisconnectExpected: Boolean;
..............

and this can be pushed by hg:
Index: D:/Program Files/Borland/FBDataset.hg/FBCustomDataSet.pas
===================================================================
--- a/FBCustomDataSet.pas	(revision 82)
+++ b/FBCustomDataSet.pas	(revision 83)
@@ -162,7 +162,6 @@
     FDisconnectExpected: Boolean;
     FAutoCommit: boolean;
     FDefaultFormats: TDefaultFormats;
-    FInspectRecNo:integer;

----------
messages: 3832
nosy: AlexRayne
priority: wish
status: unread
title: mq cant inport patches from svn
topic: mq, patch

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue691>
____________________________________________________



More information about the Mercurial-devel mailing list