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

Re: [merge-tracking] Merge all changesets that are completely automatic

From: Justin Johnson <justinjohnson_at_gmail.com>
Date: 2007-03-20 15:50:54 CET

On 3/20/07, John Peacock <jpeacock@rowman.com> wrote:
> Justin Johnson wrote:
> > Where I work there are a lot of branches being
> > maintained at the same time, and the developers want to be able to
> > schedule a cron job that will automatically merge any changesets that
> > don't require user intervention during the merge and then checkin the
> > results of the merge.
>
> You _will_ have broken branches with this scheme, I can guarantee it.
> As long as there are *no* conflicts, you won't have any problems, but it
> is not possible to automatically merge changesets in a way that will
> always produce stable code. A conflict for one branch is much more
> likely to be a conflict in other similar brances.

I don't disagree with you. However I am supporting multiple teams
here, and some of them are essentially doing this today in ClearCase
and that is how they want to work. Even if someone didn't want to
script it up they're doing here, having a way to ask Subversion to
only merge change sets that don't result in conflicts seems reasonable
to me.

Merging to a URL instead of a working copy would only make sense in my
use case, but I'm still interested in this option.

> You are much more likely to have good results by assigning a rotating
> "merge manager" role. Most of the time, the job will be very routine
> (which is why you should share the load). However, for those times when
> everything goes pear-shaped, you will be much happier having a human
> being instead of a cron job.
>
> You may also want to compare and contrast svnmerge.py with SVK's merging
> (the latter of which is has been in use for a longer time and could be
> considered to be more mature).

I was having a hard time determining if SVK could be used only for
merging while using Subversion in the normal way for everything else.
I read that working copies in SVK don't contain .svn directories.

Justin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 20 15:51:12 2007

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