[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-03-09 14:25:01 CET

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.

Stefan

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
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:29:17 2006

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