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

Re: directory cleanup branch?

From: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-02-11 22:06:28 CET

On Feb 11, 2006, at 16:48, Brett Boren wrote:

> I have a subversion project that is beginning to get rather large
> and I need to restructure the directories. To do this I cut a
> branch off of the trunk just to reorder the directories and modify
> the build system to compensate. I now have my branch how I want it
> and I want to merge my changes back in.
>
> The problem is that as I've been messing with these cleanups, the
> other developers have been commiting changes on the trunk. When I
> try to merge:
>
> "svn merge -r2721:2740 https://<server>/<project>/branches/dircleanup"
>
> into the a trunk WC, all of the commits to the moved source files
> disappear. Most of what I'm trying to commit are not changes to
> files, but changes to directories. Is this possible? Am I mistaken
> about how svn versions directories?

As was discussed on another thread on this list this past week,
that's a problematic scenario, because Subversion implements renames
not as renames but as an add followed by a delete. The only advice I
can supply is not to get into this situation: if you need to
reorganize, do not continue parallel development on another branch.
Sorry.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Feb 11 22:07:55 2006

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