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

Re: svn commit: r27964

From: Stefan Sperling <stsp_at_elego.de>
Date: 2007-11-21 19:34:28 CET

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?

Thanks,

-- 
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 Wed Nov 21 19:34:44 2007

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