[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: sNop <snop3_at_seznam.cz>
Date: Tue, 23 Mar 2010 19:36:46 +0100

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

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2010-03-23 19:36:54 CET

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