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

Re: Feature branch merging by trunk replacement question...

From: K. Richard Pixley <rich_at_noir.com>
Date: 2005-04-16 06:32:21 CEST

Daniel Patterson wrote:

> K. Richard Pixley wrote:
> > [a bunch of branching scenarios]
>
>>
>> Aside from the fact that it requires some bookkeeping, (already
>> required for merging anyway), and the fact that this approach
>> completely eliminates the need for one merge, does anyone see any
>> problems with this approach?
>
>
> Only the slight race condition between when you last merge from the
> trunk to when you delete trunk and replace it with your branch.

Wouldn't this cause a "not up to date" failure on commit?

--rich

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Apr 16 06:35:30 2005

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.