[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: Reilly, Michael <mreilly_at_techtarget.com>
Date: 2006-02-13 15:04:26 CET

Hi Brett,

 

I'm planning on doing this same project myself very shortly. Except
that I'll also be splitting the project from a much larger "all
encompassing projects repository". How I'll be handling this is by only
changing the upper-level directories, leaving the lower paths intact.
Then when I plan to merge the data, I can merge individual top
directories without worrying that my changes will have caused
inconsistencies.

 

As a demonstration of what I mean, the existing structure is:

    old-repository/

         project/

              subproject1/

                   trunk/

                        subproject1/

                   tags/

                        v1.0

                        v1.0.1

              subproject2/

                   java/

                       trunk/

                           subproject2/

                       tags/

                           v1.0

                           v1.0.2

                  perl/

                      src/

                      doc/

                      sbin/

              subproject3/

                   java/

                       trunk/

                           subproject3/

                       tags/

                       v1.0

                       v1.0.1

                       v1.0.2

 

As you can see, the structure and tagging are not consistent, and there
is the nice silly "project/trunk/project" scheme. And to top it off,
none of this matches the build system; the directory names and structure
is checked out differently from the above.

 

I'll be changing it to:

    new-repository/

        trunk/

            new-subproj1-name/

            new-subproj2-name/

                java/

                perl/

            new-subproj3-name/

                java/

        tags/

            v1.0

            v1.0.1

            v1.0.2

 

Then at this point, I'll just have to worry about merging the files
below old-repository/project/subproject/trunk/subproject to
new-repository/trunk/new-subproj-name, branch to branch merging, as it
will.

 

  -Arcege

 

________________________________

From: Brett Boren [mailto:brett.boren@gmail.com]
Sent: Saturday, February 11, 2006 10:49 AM
To: users@subversion.tigris.org
Subject: directory cleanup branch?

 

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?

Brett
Received on Mon Feb 13 15:09:26 2006

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