TortoiseSVN does not understand hg diff output
Matt Mackall
mpm at selenic.com
Thu Jun 12 14:28:52 CDT 2008
On Sun, 2008-06-08 at 13:25 +0200, Robert Wierschke wrote:
> Hi,
>
> I tried the steps described here:
> http://www.selenic.com/mercurial/wiki/index.cgi/SubversionToMercurialHowto?highlight=%28subversion%29 in order to work on code manged in a svn repository. After modifying the code I created a patch with hg diff. As I'm having commit rights for the original svn (I just wanted to try out mercurial ;) I tried to apply the created patch with TortoiseSVN but get the error message:
>
> The line "Index:" was not found!
> Either this is not a diff file or the diff is empty.
TortoiseSVN is brain-damaged. It thinks a "diff" is defined by what is
produced by "svn diff" when in fact a diff is defined by what's
-accepted- by "patch".
Diffs produced by many (if not most) tools, including "diff" itself
don't contain such an "Index:" line.
> The diff is not empty, so how can I produce patches that I can check
> into an existing svn repository?
Use patch to apply the patch rather than TortoiseSVN.
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial
mailing list