Re: svn commit: r30437 - branches/double-delete

[Karl Fogel <kf...@red-bean.com>]

sbutler@tigris.org writes:
> Log:
> Create a branch to hold the "prevent double deletes" feature we need
> for the tree-conflicts branch.
>
> This feature has an impact on merge functionality, which needs further
> discussion.  You can read all about it in issue #3156.
>
> While we're in the neighborhood, we can also fix issue #2740 (commit
> gives inconsistent "out-of-date" error messages).

For fixes not related to the topic of the branch, it's better for the
fix to "originate" on trunk (review is easier, traceability becomes a
bit easier, etc).  There are a couple of ways to handle this:

   1) Just send them as patches for trunk.
   2) Create small, temporary branches just for those fixes, merge them
      to trunk as soon as they're ready.
   3) Do them on the double-delete branch, but port them over to trunk
      as soon as they're ready.

Now that we have merge-tracking, I guess any of these are fine, even
(3).  I just wanted to point out that it's not desirable to have such
fixes sitting around on a branch for a long time -- they should get to
trunk as quickly as possible, or even start out there.

Best,
-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org