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

Re: merging/branches practices

From: Raman Gupta <rocketraman_at_fastmail.fm>
Date: 2006-03-09 04:04:55 CET

Aaron Montgomery wrote:
> This is a (newbie) question about merging/branching. I have read the
> Subversion documentation but don't remember anything like this although
> I am guessing that the situation below isn't that uncommon so maybe I
> misunderstood something in the docs.
> Here's the situation:
> A main branch (/trunk) is shared by everyone in the project.
> I create a personal branch called (/branches/aaron) at revision 100 by
> copying /trunk and I work in that branch. Along the way, I occasionally
> merge changes occurring in /trunk back to /branches/aaron (begin careful
> not to repeat a merge). Assume that the last merge of /trunk into
> /branches/aaron occurred at revision 200.
> Now I've reached a milepost in /branches/aaron (at revision 300) and
> would like at this point to completely resync my personal branch with
> /trunk (porting my changes in the branch back to trunk and then
> basically starting the process over from scratch). I do not want to
> eliminate my personal branch since I will continue working on it.

Try out svnmerge.py in the client-contrib directory. It will do all the
merge tracking for you (so you don't have to be careful to not repeat
merges), and bidirectional merging support has recently been added which
makes it easy to handle the situation you describe.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 9 04:09:55 2006

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