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

Re: How to read 3-way differences in TortoiseMerge?

From: Robert Dailey <rcdailey_at_gmail.com>
Date: Mon, 28 Jul 2008 12:30:13 -0500

On Mon, Jul 28, 2008 at 9:55 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>
> You will see that, but only if you did an update after you've last
> committed the now merged file.

Not sure what you mean here. If my working copy has revision 2 of a file
committed by user "foo" and I'm doing an update that gets revision 3
committed by user "bar", it should show the changes between revision 2 and
3, yet it is showing changes between 1 and 3. Why do I have to commit the
file being merged in order for this to work right? I can't do that anyway,
because I have to update (to get the latest version) before I'm allowed to
commit that file. Could you please clarify with examples?

> TSVN does not know which files are affected in an update *before* the
> actual update. But after the update has finished, it can't check what
> revision the file was at in the working copy before the update to show you
> the diff you would expect.
> So the only workaround is to get the revision the folder you run the update
> on has in the working copy before the update.

Here is what I would expect TortoiseSVN to do without having looked at the
implementation:

   1. User performs an "Update" on a specific directory in a working copy
   2. During the update process, temporarily store the revision number of
   the current working version for each file that is updated.
   3. When the update is complete, it now has a list of old revisions before
   the update for only those files updated.
   4. When the user does a "Diff" on merged items, it will show the diff
   between that temporarily stored revision number and the new updated revision

You've been explaining how this works, however it isn't helping me
understand it. I'm reading words & sentences but they don't mean anything.
Perhaps I need examples of some sort. Everyone else seems to understand this
perfectly fine, I'm not sure why this is so confusing for me.
Received on 2008-07-28 19:30:22 CEST

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