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

Re: svn merge on branches containing moved files/directories

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-03-16 15:14:41 CET

On Mar 16, 2005, at 7:51 AM, Greg Thomas wrote:
> However, if the developer moved A->A1 and copied A1->A2 and A2->A3,
> then removed the extra stuff, there's at least the possibility that a
> merge could resolve this.

I think Stefan has a good point though. Forget all about splitting of
files, moves, and copies.

The simple fact is: "tree conflicts" still happen. One one branch, a
file may be deleted, and on another branch the file might be changed.
When merging the latter branch to the former branch, we get a 'skipped'
message: the merge command is unable to apply a change to a file
that's just not there. When merging in the other direction, the merge
command silently deletes the newer version of the file.

I wonder if we can teach the merge command to notice this situation,
and throw a warning, flag the file, do something. It's worth a
discussion on dev@ if somebody wants to bring it up there.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 16 15:17:31 2005

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.