[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: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2007-11-21 19:38:33 CET

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)

I admit that I've been cheating (though, I don't recall making a conscious
effort to do so), spoiled by the fact that I'm using a 1.5-dev client and
working on the merge-tracking code.

I really should go back and populate those log messages with the merge
ranges, especially as my not-yet-fully-decided plan for the 1.5-rc1 upgrade
of svn.collab.net involves stripping all the svn:mergeinfo properties from
the repository.

Good catch, Stefan!

> Also, how frequently do you tend to sync with trunk?

I sync whenever I know something on trunk has the potential to conflict with
my branch work. For me, it's about keeping conflict resolution as simple as
possible.

-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on Wed Nov 21 19:38:48 2007

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