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

RE: Merging question

From: Witham, Michael S. NAVAIR <michael.s.witham_at_navy.mil>
Date: 2005-11-19 03:18:12 CET

> > I have a question along the lines of this thread: "Merging moved
> > files" (http://svn.haxx.se/users/archive-2004-05/0451.shtml)
> >
> > I am currently trying to do something similar: a major
> > reorganization of our directory structure (5 years of no planning
> > and neglect made it a mess!). The problem is that some changes are
> > still being done on the main line of development (trunk). I am
> > trying to do the reorg in a branch, then rewrite all of our build
> > scripts (and etc), then merge the changes back into the trunk.

> What Simon didn't appear to have done in that thread you referenced
> is merge trunk changes into his branch before attempting to merge his
> branch changes into the trunk. AFAIK it's necessary to first get the
> reorg branch into such a state that it is the same as the trunk, with
> the exception that it contains your additions. That is, there should
> not be any work which has been done on trunk but which has not also
> been done in the branch. The process of merging the trunk changes to
> the branch should cause the behavior about which we're speaking, that
> is, that things that conflict with each become unversioned.

Once I move a file, I cannot propagate changes to that file in either direction -- i.e. from trunk to branch nor branch to trunk. Therefore,
I cannot bring the branch up to date with the trunk (without resorting to doing it manually). I was hoping that since it allows me to copy the 'move' revisions from the branch to the trunk, that I could just do that -- but the problem raised in Simon's thread was that I will lose changes done to the trunk since the branch was created. It looks like I will have to take an afternoon, tell everyone they cannot make any changes until I am done, and re-org the trunk instead of doing it on a branch. This still doesn't solve the problem of propagating bug fixes from our release branch into the trunk though.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Nov 19 03:18:35 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.