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

Re: Directory replaced by symlink breaks merge 1 of 20)

From: <subversion.mexon_at_spamgourmet.com>
Date: 2007-06-13 15:55:34 CEST

Erik Huelsmann - ehuels@gmail.com wrote:

> Merge until the directory delete and commit, then merge from the link
> creation and commit.

That's not really possible in this case: there are many directories and
many links, spread over many commits. It would be too much work to
disentangle them all. Instead, I'll probably just re-do everything by
hand (and screw the ancestry).

> Subversion currently doesn't provide support for inter-node-type
> replacements. Any working replacement where the node types of the
> original node and the new node differ is purely accidental.

But all I'm expecting here is that Subversion will do in my trunk what
was done in my branch, in this case delete files and then create files.
 The only thing that's preventing this from working is Subversion's
behaviour of not deleting directories when performing a merge. I can
understand why it does that, but it's still a surprise when it happens.

Is there any particular reason why Subversion can't have a flag for the
merge telling it to really delete directories?

The thing I find weird is, surely this is a common situation? That is,
you want to rename a directory, and set up a link at the old location
for backwards compatibility. Maybe I'm the first person in the world to
encounter this problem, but I can't believe I'll be the last.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 13 15:56:04 2007

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.