[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: Christophe R <christophe_r_at_comcast.net>
Date: Wed, 30 Sep 2009 08:34:28 -0700

> If you get the three pane view in TMerge, that means that the file in
> the repository (the url you chose to compare with) isn't the same as the
> unmodified file in your working copy.
>
> I just tried this with a file in the TSVN working copy: it shows the
> proper two-way diff since I know it hasn't changed in the repository.
> I only get a three-way diff if I use my test repo and make sure that the
> url I diff with has one (or more) revs added than the file in my working
> copy (and the local file has modifications).
>
> Stefan

Thank you Stefan, and sorry for my late answer.
My WC points to a branch, and my WC is up to date, and I still see the three
way diff. Could this be explained by the fact that the files have not
changed since the branch was created? (before I made my local changes to
those files, their content was the same everywhere: trunk, branch, WC).

Christophe

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-30 18:23:28 CEST

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