[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:55:26 CET

> From: Stefan Küng [mailto:tortoisesvn@gmail.com]
> Sent: Donnerstag, 9. März 2006 14:25
>
> 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.

Ok, I wasn't exactly sure how/when subversion detects a merge as conflicting.

>
> But if your code still compiles/works, that's a completely different
> issue which can't be solved by Subversion.

Yes, of course.

>
> > 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.

That's great news!

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Mar 9 15:00:42 2006

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