[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 19:45:59 CET

Simon Large wrote:
> 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?

We check before the update what the last-committed-revision is of the
items selected. That revision is then used for those compares, and also
to show the log (if you click on "Show log" after an update).

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 19:46:21 2006

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