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

RE: Am I able to delete a folder in the trunk but have it persist in a branch?

From: Thijs de Ridder <thijs.de.ridder_at_mep-telecom.com>
Date: Thu, 21 Aug 2014 17:26:51 +0200

On 21/08/2014 Will Rose wrote:
>
> Let's say my trunk has three folder.
> - Folder1
> - Folder2
> - Folder3
>
> I create a branch MyBranch based on the trunk.
>
> Then I delete Folder2 from the trunk because maybe it's unstable code.

>
> Is there a way for Folder2 to persist inside MyBranch? My problem
right now is if I want to merge changes from the trunk to MyBranch, it
wants to delete Folder2 every time. I could allow it to delete and then
copy the folder back in manually, but then I think I lose my revision
history.
>
> Is there an easy answer to this? Thanks.
>

Yes. You can do a record only.
Let's say you removed the Folder2 in revision 15. In the branch merge
from trunk but just select revision 15 for merge. Just before the merge
(In the Merge options) select 'Only record the merge'. Execute the merge
and commit into the branch.

SVN internally administrated the merge has been executed, but it
actually didn't merge the changes. Therefore it doesn't want to merge
the changes again. So in future merges you don't have to worry revision
15 is merged and removes Folder2.

Best regards,
Thijs

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-08-21 17:27:02 CEST

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