[Svnmerge] Merging blocked revisions between branches

[David James]

On 3/23/06, Giovanni Bajo <rasky at develer.com> wrote:
> Blair Zajac <blair at orcaware.com> wrote:
>
> > I agree with your initial assessment to not merge r10 over for the
> > reason that it has the principal of least surprise that svnmerge.py
> > does not remove any changes in one changeset when merging them over,
> > even its own properties.
> +1. So, is a patch needed at all?

Yup. Currently, svnmerge.py does not merge metadata for blocked
properties correctly. For instance:
1. Block r10 from merging from branchA to branchB
2. Block r20 from merging from branchA to branchC
3. Merge changes from branchB to branchC

In this case, the merge in (3) does not merge the blocked properties
correctly due to a property conflict.

Cheers,

David

--
David James -- http://www.cs.toronto.edu/~james