[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: Thu, 24 Jun 2010 08:42:51 +0200

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.

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

Again, you only get the 'theirs' part for the current revision range
that's merged.

> Or something else? Confused.com

have to looked at that website? :)

Stefan

-- 
        ___
   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=2625351
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-24 08:43:29 CEST

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