[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TortoiseMerge apply unified diff error

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-12-14 21:01:33 CET

Glenn R Heard Jr wrote:
> On Wednesday, December 14, 2005 1:55 PM, Stefan Küng
> <mailto:tortoisesvn@gmail.com> wrote:
>> If you can send the diff file (zipped please - to make sure the mail
>> clients don't change e.g. lineendings) I can have a look.
> Here is the diff.
> Thanks for looking at this Stefan.

Yes, the "Index: filepath" line is missing. Not sure if I will change
TortoiseMerge to support these kind of diff files too. It currently only
supports diff files created with a Subversion client. I thought that the
linux diff tool would create the same kind of diff-files, but obviously
I was wrong :(


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Dec 14 21:02:05 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.