[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: Daniel Patterson <danpat_at_danpat.net>
Date: 2005-04-16 01:54:12 CEST

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.

   There is a slight chance that more changes could be made to the
   trunk, which you promtly delete, and they never get merged. You
   can of course mitigate this by being careful. However, if you
   always merge, there is no risk of losing changes, but your merge
   might not be trivial.

   And natrually, because it's subversion and you never really lose
   anything, if you find out later that some changes from trunk
   were not merged before the replacement, you can always merge them
   into the current trunk.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Apr 16 01:57:02 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.