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

Re: Suspending commits

From: Blair Zajac <blair_at_orcaware.com>
Date: 2006-07-25 00:07:35 CEST

Michael Pickard wrote:
>> -----Original Message-----
>> From: Andy Levy [mailto:andy.levy@gmail.com]
>> Sent: 24 July 2006 11:55
>> To: Michael Pickard
>> Cc: users@subversion.tigris.org; Nico Kadel-Garcia; Mike Craig
>> Subject: Re: Re: Suspending commits
>>
>> On 7/24/06, Michael Pickard <mpickard@visitlondon.com> wrote:
>>> Because there may be a need to rebuild if something fails UAT, hence
>>> 'without my prior authorisation'.
>>>
>>> If I needed to rebranch each time, I'd get at least one or two new
>> branches
>>> a week *plus* any branches created by failed UAT - it would soon
> become
>>> unwieldy.
>> And your management is OK with development coming to a near-halt every
>> time UAT starts? Can't say I've worked in a place that would accept
>> that.
>
> I'm fine with it. The three developers concerned are perfectly able to
> work locally for a day.
>
>> You really ought to create tags and build from those. You'll get the
>> "lockdown" you're after (only allow one person to create tags), get a
>> "snapshot" of the code at any time as a result for repeatable builds,
>> and you don't have to stop developers from committing at all.
>
> OK, so let's say I create a tag and build for UAT from that.
> Dev A checks in some code,
> Dev B checks in some code,
> Dev A checks in some code,
> I'm notified of a failure in UAT and ask for a fix to be committed,
> Dev C checks in a fix
> I tag and build again.

If you have devs A, B and C all working on trunk and your branch had an error
from it, you can merge the commit that Dev C made from the trunk to the branch
over, without pulling the commits that A and B made.

If you have the possibility of making more changes to a tag, then don't tag, but
create a branch and then tag from that.

The other possibility is to have Dev C work in the branch and when the fix is
accepted, merge it from the branch back to the trunk.

I recommend using the svnmerge.py tool to keep track of the revisions that you
have already merged from the trunk to the branch, and it let's you cherry pick
revisions. It's a lot easier than manually keeping track of revisions.

http://www.orcaware.com/svn/wiki/index.php/Svnmerge.py

Regards,
Blair

-- 
Blair Zajac, Ph.D.
<blair@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 25 00:08:50 2006

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