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

RE: Proper way to delete file from repository

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Tue, 24 Sep 2013 18:16:59 +0000

> I am wondering what is the recommended method to:
> 1. rename a file in a repository across trunk and development branches.
> 2. delete a file across trunk and development branches.
> To delete a file on my current project where there is a trunk and 3
> development branches it seems we always get tree conflicts when we merge
> into the trunk and I am wondering what the recommended method is.

It really depends on your branching strategy. If the branches are children of the trunk, I would say, delete the file in trunk, and then merge the delete into the branches.

I'm not sure why you would consider a delete change and different than any other code change? Of course, with a delete there is the possibility of a tree conflict. For example, if you delete foo.cs in trunk, and someone edits foo.cs in a branch. When merging the delete to the branch you are going to get a tree conflict... svn is telling you, "Hey, the merge source wants to delete this file, but you've changed it... what you wanna do boss?"



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-24 20:17:10 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.