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

Re: Diff with URL: tortoiseMerge

From: <chroyer_at_comcast.net>
Date: Thu, 3 Dec 2009 21:36:31 +0000 (UTC)

> So the reason for this behavior is that the patch file that gets
> generated shows the diff between your wc of the branch with the trunk
> url. Since you've modified the files on your branch already, the patch
> doesn't apply anymore. And that's because the diff that svn produces
> here is backwards. I've reported this several times already but with
> the complete rewrite of the diffing engine on the svn trunk I doubt
> that this will get ever fixed on the 1.6.x branch.
>
> Sorry.
>
> Stefan

Thank you Stefan. In my scenario, this is not a big deal, but I was afraid that something more fundamental was broken. I am not sure of all the implications of that "backwards" diff, I should look into that a bit more.

Christophe

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2426837

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-03 22:39:21 CET

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