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

Re: [Merge] Merge Question - Use local and Use repository

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Wed, 23 Jun 2010 23:00:47 +0100

On 23 March 2010 22:15, Simon Large <simon.tortoisesvn_at_googlemail.com> wrote:
>>
>>> Which file is used when I select "Use local" (file in working copy or
>>> file in trunk reposity??)  and which file is used when I select "Use
>>> repository" (file in trunk or file in ^/branches/3.0.0??) ??
>>>
>>> And have the choices in this dialog the same meaning ?:
>>> http://img532.imageshack.us/img532/586/merge2.png
>>>
>>>
>>
>> I think, that documentation at:
>> http://img683.imageshack.us/img683/1395/merge3.png
>>
>> should be updated, I suggest add two sentences.
>>
>> If you choose "Use Local" the conflict is resolved using the file that was in your working copy when you started the merge.
>
> This is true.
>
>> If you choose "Use Repository" the conflict is resolved using the file that was in the HEAD revisions from the source path in the repository, that you are merging from.
>
> But this is not. The conflict is resolved using the file from the
> source path in the repository at the latest revision you specified in
> the merge. That may well not be HEAD.
>
> I will take a look at the docs.

Hi Stefan,

I am now looking at the docs for this, but I think my explanation may
also be wrong and I have got completely confused. If you merge several
ranges of revisions I believe the merge is done in chunks, one for
each unbroken range. So if the conflict happens on the second range
the first range has already been merged.

If at this point I select 'Use local', am I selecting the whole file
in the WC as it was when the merge started, after the first range
completed and before the second range started, or do I just select the
'mine' section between any conflict markers, leaving all successfully
merged sections in place?

If I select 'Use repository' do I get the entire repo file
corresponding to the last revision in the second range, or again just
the 'theirs' section between any conflict markers?

Or something else? Confused.com

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2625196
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-24 00:04:02 CEST

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