Re: Problems with property conflict callback

On 10/29/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> Just tested with a property conflict on a folder, and indeed, the
> callback is not called but a conflict is created for it.

I think it might be related to the logic you used to decide whether
there is a base version or not. I can recreate the same problem with
a file or folder.

Start with a trunk that has some properties set.
Copy trunk to create a branch
Modify and commit changes to the same property on both
Merge branch to trunk

This is seemingly the simplest scenario to support as there is a very
obvious base version to use.

Oddly, if I add a new property to trunk and base (with different
values) the callback is called.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org