Problems while applying an svn patch to a mercurial repository

Posted by user26453 on Super User See other posts from Super User or by user26453
Published on 2010-03-09T03:06:10Z Indexed on 2010/03/09 3:08 UTC
Read the original article Hit count: 353

Filed under:

source

|

subversion

|

tortoise-svn

|

mercurial

|

hg

Patch file is made with TopirtiseSVN -> Create Patch...

Attempting to import patch into the mercurial repository using hg import patchfile.

The problem I'm running into is that there seems to be problems with how hg looks for files referenced in the patch file:

unable to find 'gui/gui/RemoteFramework.cpp' for patching
2 out of 2 hunks FAILED -- saving rejects to file gui/gui/RemoteFramwork.cpp.rej

Seems to be an issue of where the patch was made in terms of directories and where it should be applied. Have tried playing with the --base option for hg import, but haven't gotten anywhere just yet.

Anyone have any tips?

© Super User or respective owner

Related posts about source

UnsatisfiedLinkError on xawt when running HEC-HMS.sh

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I am a recent adopter of Linux and this problem has got me stumped. I use HEC-HMS and HEC-DSSVue for work on a regular basis. I have been using the widows versions in wine but they are really buggy. So I decided to try out the linux versions. the links below will take you to the download pages for… >>> More
Introducing Java/Open Source Daily, All the Java/Open Source Information You Need in One Newsletter

as seen on Internet.com - Search for 'Internet.com'
Internet.com launches a new daily newsletter to provide one-stop coverage of all the Java and Open Source information that matters to you. >>> More
Introducing Java/Open Source Daily, All the Java/Open Source Information You Need in One Newsletter

as seen on Internet.com - Search for 'Internet.com'
Internet.com launches a new daily newsletter to provide one-stop coverage of all the Java and Open Source information that matters to you. >>> More
The Open Source Open Source Conference

as seen on Internet.com - Search for 'Internet.com'
Portland, OR open source advocates took the loss of OSCON in stride: They launched their own open source conference. How did it stack up against the heavyweight, top-down competition? >>> More
Open Source: Open Source Contributions

as seen on Oracle Technology Network - Search for 'Oracle Technology Network'
Oracle investments in Linux yield substantial returns. >>> More

Related posts about subversion

Does Subversion have an analogue to VSS's links?

as seen on Stack Overflow - Search for 'Stack Overflow'
I am migrating a Visual SourceSafe code repository to Subversion and I am running into a problem. Here is a simplified layout of our current source code tree (in VSS): project_root\ |-libs\ |-tools\ |-arch_1\ | |-include | |-source |-arch_2\ |-include |-source My problem… >>> More
Complex reporting on subversion (possibly Export Subversion log into database for reporting)

as seen on Stack Overflow - Search for 'Stack Overflow'
What is the best way to do complex reporting on subversion logs like the following for each file? file, directory, last revision date, previous revision date(where revision date is at least 30 older than last), days diff(between revision dates) Since Subversion allows on revision to change multiple… >>> More
Can't install py-subversion on freebsd 8.2

as seen on Super User - Search for 'Super User'
I'm trying to install python bindings for subversion: # cd /usr/ports/devel/py-subversion # make ===> Patching for py26-subversion-1.6.15 ===> Applying extra patch /usr/ports/devel/py-subversion/../../devel/subversion/files /bindings-patch-subversion--bindings--swig--perl--native--Makefile… >>> More
Access denied error when building project in Xcode after fresh SVN checkout

as seen on Stack Overflow - Search for 'Stack Overflow'
I am seeing 2 strange access denied errors which I cant solve. This error occurs when a colleague checks out the project in SVN and it tries to find a file in my downloads folder - there is nothing in my download folder though: ProcessPCH /var/folders/f0/f01B78egHdyWY62v5MABJk+++TM/-Caches-/com… >>> More
Are there any subversion "dash board" web applications that can show me a list of recent commits from all my repositories?

as seen on Programmers - Search for 'Programmers'
I am looking for something like a subversion dashboard that at the very least can show me commits from across a group of repositories. Is there anything like this available? Since it could just as well be dead simple and I can't find anything immediately I am thinking if just scratching my own itch… >>> More