[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: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Thu, 21 Aug 2014 10:15:22 -0500

On Thu, Aug 21, 2014 at 10:07 AM, Will Rose <will_at_willrose.ca> 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.
Allow it to delete during the merge, but DON'T COMMIT YET. Do "check for
modifications" so you can see that the folder was deleted. Use "revert" to
get the folder back. THEN you can commit.

Actually you can also use revert from within the "commit" dialog where you
will likewise see the deletion, but then you risk accidentally committing
the deletion if you forget.


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

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