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

Re[2]: Merge of deleted file with a modified one

From: Alexey Yudichev <ayud_at_newmail.ru>
Date: 2006-01-07 00:55:40 CET

> Anyway, I'm pretty sure that deleting the file was the right thing for
> merge to do in this case, as it was applying the tree delta to the
> trunk. If you didn't want the file deleted, you have a chance to
> revert that part of the change before committing.

From point of view of a developer working in a trunk, this is a lost
change. In a big project with many files removed "correctly", i.e.
removed in the branch and unchanged in the trunk, this "incorrect"
deletion will be lost among them. This can be sometimes acceptable,
for example if removal is a result of a large scale refactoring, and
the change made in the trunk is no more relevant. In other cases, this
can create a long outstanding problem, for example, if the deletion in
the branch was made by mistake.

Couple of our developers called this feature a show stopper for
employing subversion in our company.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jan 7 00:57:55 2006

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

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