On Wed, Nov 21, 2007 at 10:52:18AM -0800, Daniel Rall wrote:
> On Wed, 21 Nov 2007, Blair Zajac wrote:
>
> > Stefan Sperling wrote:
> > >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.
Thanks for all comments. I guess I will play with the alternatives
(rev numbers in log message, svnmerge.py, svk, 1.5 client with merge
tracking) in a private repo and see which works best for me.
Once I've decided on a sync strategy I'll create the branch and
use the strategy consistenly for the life time of the branch.
--
Stefan Sperling <stsp@elego.de> Software Developer
elego Software Solutions GmbH HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96
13355 Berlin Fax: +49 30 23 45 86 95
http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
- application/pgp-signature attachment: stored
Received on Fri Nov 23 11:45:45 2007