[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 25 Jun 2010 13:22:24 +0200

On 24.06.2010 10:23, Simon Large wrote:
> On 24 June 2010 07:42, Stefan Küng<tortoisesvn_at_gmail.com> wrote:
>> On 24.06.2010 00:00, Simon Large wrote:
>>> 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.
>> Yes.
>>> 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?
>> You select the 'mine' section for this merge range.
>> That's why you can get several of those dialogs for the same merge: once
>> for each range that leads to conflicts.
> Just to clarify, here is an example: merge 1-3, 7-8. Assume 1-3
> merges cleanly, 7-8 has 3 sections which merge OK and one section with
> conflicts. If I select 'Use local' I get the complete merge of 1-3,
> the successful 3 chunks in 7-8 and the 'mine' sections of the
> conflicts in 7-8. And if I choose 'Use repository' I get the same, but
> instead using the 'theirs' section of the conflicts. Is that correct?



   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-25 13:22:54 CEST

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