[Svnmerge] Conflict on svnmerge-blocked property

[Raman Gupta]

Piet-Hein Peeters wrote:
> 
> We have a merge strategy in which we merge changesets from
> /branches/dicomviewer23 to /branches/pmw and changesets from
> /branches/pmw to /branches/pmw-pre-dev.
> On the /branches/pmw and /branches/pmw-pre-dev the svnmerge-blocked
> property is set to block the merge of a few revisions from its source.
> The patched svnmerge.py handles the merge correctly for the
> svnmerge-integrated property but not for the svnmerge-blocked property.
> (see attachment).
> My question is: Is there a patch available for svnmerge.py that also
> handles merge conflicts like this on the svnmerge-blocked property?

Please provide a test case in the form of an update to the
svnmerge_test.py, or as a shell script that initializes a repository
and then uses it to reproduce your error. That'll make it much easier
to investigate this.

Cheers,
Raman Gupta