[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: Wed, 23 Jul 2008 17:54:46 -0500

On Wed, Jul 23, 2008 at 4:52 PM, Simon Large <
simon.tortoisesvn_at_googlemail.com> wrote:

> 2008/7/23 Robert Dailey <rcdailey_at_gmail.com>:>
> > I'm still pretty confused about that top-left pane.
> >
> > You say it's the merge result of the last commit revision and BASE. BASE
> I'm
> > assuming is the lastest revision of that file that I have in my working
> > copy. The last commit revision seems like it would be the exact same
> thing,
> > since my last update OBTAINED the last commit revision (as it would have
> > been committed by someone else). The file showed the following:
> >
> > The changes for *this* update (the update that resulted in me viewing the
> > diff in the first place)
> > Changes from about 2-3 updates back (These shouldn't be showing up, as
> they
> > have nothing to do with what I care about... which is the changes
> obtained
> > in *this* update)
> >
> > Sorry for being slow about this. I appreciate you taking the time to
> explain
> > this to me.
>
> I'm guessing here, but I could imagine TSVN noting the last-commit
> revision of the item being updated before doing the update, then using
> that revision as the basis for the 3-way diff. Does that make any more
> sense of your data?

Say we have a file named foo.cpp that has 3 commit revisions (In other
words, I committed the file 3 times and each commit resulted in the
corresponding revision number): 10 29 48

When I do an update that gives me foo.cpp at revision 48, are you saying
that it will diff the changes between 29 and 48 in the top-left pane? If
this is so, why am I seeing changes that should only be showing up when I
diff between 10 & 29?
Received on 2008-07-24 00:54:58 CEST

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