On Wed, 21 Nov 2007, Blair Zajac wrote:
> Stefan Sperling wrote:
> >On Wed, Nov 21, 2007 at 10:02:52AM -0800, cmpilato@tigris.org wrote:
> >>Author: cmpilato
> >>Date: Wed Nov 21 10:02:51 2007
> >>New Revision: 27964
> >>
> >>Log:
> >>On the 'mergeinfoless-copies' branch, merge outstanding trunk changes.
> >
> >Michael and others,
> >
> >given that I will have to do the same thing soon while maintaining
> >the tree conflicts branch, how do you keep your branches in the svn
> >repository in sync with trunk?
> >
> >You don't seem to follow the book, which says:
> > "... until the day Subversion grows this feature, you'll have to track
> > merge information yourself. The best place to do this is in the
> > commit log-message."
> >(http://svnbook.red-bean.com/nightly/en/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.bestprac)
> >
> >In other projects using svn I usually track merges by setting
> >tags on both trunk and the branch that indicate merge points.
> >In essence I never merge from a branch, only from tags.
> >This makes it easy to keep track of what has already been merged.
> >But I guess setting tons of tags may get a bit unwieldy in a busy
> >repository.
> >
> >Also, how frequently do you tend to sync with trunk?
> >Whenever you feel like it?
> >Once a week?
> >Whenever big changes happened on trunk?
>
> If you're not using a 1.5 trunk client to do the merges, then use
> svnmerge.py to keep the branch in sync:
>
> http://www.orcaware.com/svn/wiki/Svnmerge.py
>
> Syncing more frequently is better then less frequently in case you get
> conflicts, they are easier to resolve.
Stefan, while we have been using svnmerge.py to track merges, Mike
(and Dave, I think) seem to recently have had success using a
Subversion 1.5 client's tracking against our 1.4 svn.collab.net server
for their feature branches. We've also had some folks using svk.
For a feature branch, take your pick. Our maintenance branches are
still using svnmerge.py, though, which as Blair says, is probably
still our formal recommendation.
- application/pgp-signature attachment: stored
Received on Wed Nov 21 19:52:48 2007