[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 16:49:22 CET

> From: Simon Large [mailto:simon@skirridsystems.co.uk]
> Stefan Küng wrote:
> > On 3/9/06, Sven Kirchner <Sven.Kirchner@innomea.com> wrote:
> >> 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?
> >
> > Your local changes are definietly the same. Otherwise the update would
> > have created a conflict and not a merge.
> >
> > But if your code still compiles/works, that's a completely different
> > issue which can't be solved by Subversion.
> >
> >> 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?
> >
> > Someone with access to the tracker PFAI.
> How will that work? After an update, how do you know what the BASE
> revision was before the update?

I don't know, but it already works right now. When TSVN->Updating and you get merged entries you can double click the items which will launch a diff base<>wc, and you can right click "Compare with working copy" which does a diff revision_before_update<>wc. Correct me if I'm wrong.

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Mar 9 16:57:54 2006

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