Issue691

Title Add -p/--strip option to qimport
Priority wish Status chatting
Superseder Nosy List AlexRayne, ThomasAH, brendan, tonfa
Assigned To Topics mq

Created on 2007-08-16.16:19:11 by AlexRayne, last changed 2008-02-17.22:49:18 by ThomasAH.

Messages
msg5328 (view) Author: ThomasAH Date: 2008-02-17.22:48:56
Adjusted title
msg3858 (view) Author: AlexRayne Date: 2007-08-20.08:50:49
Ok, look like stay least to add switch -p to qimport command
msg3842 (view) Author: tonfa Date: 2007-08-17.12:55:39
By the way I think you can add -p1 to svn diff, otherwise 'hg import -p0' ; 'hg
qimport -r' will work (or patch -p0 < patchname, hg qnew -f)
msg3833 (view) Author: brendan Date: 2007-08-16.16:45:24
duplicate of issue311
msg3832 (view) Author: AlexRayne Date: 2007-08-16.16:19:09
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;
History
Date User Action Args
2008-02-17 22:49:18ThomasAHsettopic: - patch
nosy: ThomasAH, tonfa, brendan, AlexRayne
2008-02-17 22:48:56ThomasAHsetnosy: + ThomasAH
superseder: - hgweb incorrectly display removed files
messages: + msg5328
title: mq cant inport patches from svn -> Add -p/--strip option to qimport
2007-08-20 08:50:49AlexRaynesetnosy: tonfa, brendan, AlexRayne
messages: + msg3858
2007-08-17 12:55:41tonfasetstatus: resolved -> chatting
nosy: + tonfa
messages: + msg3842
2007-08-17 11:16:59tonfasetnosy: brendan, AlexRayne
superseder: + hgweb incorrectly display removed files
2007-08-16 16:45:25brendansetstatus: unread -> resolved
nosy: + brendan
messages: + msg3833
2007-08-16 16:19:11AlexRaynecreate