[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: Bob Archer <bob.archer_at_amsi.com>
Date: Tue, 23 Mar 2010 17:22:04 -0400

> On 23 March 2010 18:36, sNop <snop3_at_seznam.cz> wrote:
> > To Bob,
> >
> >> I will use the file from the source path in the repo that you are
> merging from. The same as where all the other source comes.
> >>
> >> So, for example... if you are in your WC which points to $REPO/trunk
> and you merge from $REPO/branch it will be pulling the files from branch.
> >>
> >>
> >
> > I want to Thank you very much for explanation, thank.
> >
> >
> > To Stefan,
> >
> >> 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.

Right, sorry... since I wasn't writing doc I wasn't as specific as you were.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2463981

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-23 22:21:00 CET

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