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

Re: Questions about tag style branch/merge approach

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-05-04 20:19:54 CEST

On Tue, 2004-05-04 at 12:27, David Budworth wrote:

> Only problem is, how does one reset that merge point in an atomic
> fashion?

> We have been doing this as:
> svn del svn://repo/merge-points/mybranch -m 'resetting mp'
> svn cp svn://repo/trunk svn://repo/merge-points/mybranch

This is correct.

> But it's not atomic, and if someone commits to the trunk after I do my
> trunk merge and before I re-create my merge point, I lose changes that
> the other person committed to trunk.

So stop copying the HEAD revision of trunk! HEAD is a moving target, as
you say. It could refer to r1213 one moment and r1214 the next. If you
merge changes to a trunk WC and commit, note the exact revision number
you've created, say revision X. Then run 'svn cp -rX trunkURL

> Plus it revs to repo three times for every trunk merge cycle (not a big
> deal, but mildly annoying)

Nothing you can do about that. You don't have to delete old
mergepoints, of course. You could just create a bunch of them:
mergepointA, mergepointB, all the way through the alphabet. Or give
them number prefixes.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 4 20:23:55 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.