Problems while applying an svn patch to a mercurial repository?

I suspect you need to do hg import --strip 0 patchfile since Subversion doesn't include any prefix on the file path. --base specifies where it should search for files, and --strip says how many (default 1) path elements to ignore on the beginning of the diff headers.

If you use the "patch" synonym to import, and the short form of --strip, it looks a lot like using plain old patch: hg patch -p0 patchfile – krupan Jun 9 '10 at 21:40 Thank you! This helped me as well. BTW, this very thing works for CVS patches like a charm!

– Yan Sklyarenko Dec 7 '10 at 16:37.

I've had the same problem moving my project, CartoType, from Subversion to Mercurial. I had the Subversion stuff checked out to C:\CartoType, and a clone of the Mercurial repository in C:\CartoType-mercurial. I used TortoiseSVN to create unified diff files, and found that it was using paths like C:/CartoType/src/main/router/cartotype_router.

H in them. Running hg patch in C:\CartoType-mercurial, I found the right thing to do was to strip two elements from the path, thus: hg patch -p2 c:\temp\patch1982. Diff The other important thing I needed to do was replace the 'Index' lines in the diff file with check-in comments, because that's where hg patch gets them from.So in this example I had to change the first line of my diff file from Index: C:/CartoType/src/main/router/cartotype_router.

H to Added an optional parameter to NewRoadOrWalkingRouter... (etc. ) If there are multiple Index lines in the diff file, change them all to the same check-in comment.

I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.