[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problems with property conflict callback

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-10-29 17:26:06 CET

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.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 29 17:26:19 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.