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

Re: Differences after automatic merge

From: Sven Kirchner <Sven.Kirchner_at_innomea.com>
Date: 2006-03-09 14:00:54 CET

> From: Stefan Küng [mailto:tortoisesvn@gmail.com]
> Sent: Donnerstag, 9. März 2006 13:03
>
> On 3/9/06, Sven Kirchner <Sven.Kirchner@innomea.com> wrote:
<snip>
> > > Can someone explain in detail what the exact difference (there
> > > obviously is one) between those two comparisons is, and what it can
> > > be used for?
>
> The doubleclick (diff between WC and BASE) is used to check your
> modifications which aren't committed yet. After a merge, you can check
> that way if the merge was "succesfull", i.e. if it didn't mess up your
> file.

Yes and this is definitely useful. But is there a way to ensure if my local differences to the repository (aka my changes) are the same before/after the merge?

Would it be an option to have a context menu item to launch a 3-way merge viewer with base/old/mine so I can perfectly ensure the merge went ok?

Don't misunderstand, I don't want to disable the automatic merge, just want to have a way to ensure that it went ok.

>
> The "compare with working copy" is to check what modifications were
> done by the merge, i.e. what the update changed (you can see the
> changes others committed).
>
> > > Btw: Isn't it kind of weird to have the "Compare with working copy"
> > > context menu item in bold (implying it is the default) and having
> > > double click doing something different?
>
> I'll check that.
>
> Stefan

Thanks a lot for your helpful answers, thanks a ton for TSVN!

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Mar 9 14:06:46 2006

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