[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 12:57:22 -0400

> Hi Bob,
>
> thank you for your response. As you wrote when is selected "Use local"
> file in WC is used.
>
> But you wrote:
> > If you choose "Use Repository" the HEAD revisions from the repository is
> used.
>
> But HEAD rev. from which reposity ? From HEAD trunk or from HEAD rev. of
> the branch which i'm merging ?
>
> Thank you for response.

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.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-23 17:56:14 CET

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