[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Question on TSVN Copy

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Wed, 21 Sep 2011 13:58:03 -0400

> In the TortoiseSVN "Help", under "Copying/Moving/Renaming Files and
> Folders", it reads "...if you subsequently fix a bug in the original files, you can
> only merge the fix automatically if the new copy is related to the original in
> Subversion."

I think it is basically trying to say use Copy/Move in SVN rather than just doing a delete and copy/move in your file system then adding it to svn. If you do the former the ancestry should be maintained.

>
> I have a trunk and one branch that was established several levels up from the
> repository root.  There is a directory of files that is below the place where the
> branch was created, that I need to move up into the trunk.  Then I need to
> make a copy of that directory of files from the trunk to the branch.
>
> Plan is to use the right-click menu and make an "SVN Copy" in the
> branch.  But, I'm confused about "if you... fix a bug in the original files, you
> can only merge the fix automatically...".  Does this mean if I change
> something in the copy of files that are in the trunk, the change will
> automatically migrate to the copy of files that are in the branch?  That's
> certainly not what I want.

No changes will not automatically migrate. ;)

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-09-21 19:59:24 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.