[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-28 11:28:34 CET

Ben Collins-Sussman wrote:
> Mark and Stefan: I've fixed up the property-conflict callback logic
> quite a bit in r27443, and I've written a "guide" for handling them in svn
> clients. I hope this will make it easier for you guys to get good
> behavior from TSVN and Subclipse!

[snip]

> * Hand-testing your interactive property handling (for sanity):
>
> - Both agents try to change an existing property, but to different values.
>
> -> CLI offers a diff between base and merged, to show the prop
> conflicts.
>
> - Both agents attempt to add a new property, but with different
> values.
>
> -> CLI offers a diff between mine and theirs, to show the
> disagreement in newly-added values.
>
> - One agent tries to change an existing property, other agent tries
> to delete it.
>
> -> CLI simply says, "You want to delete the prop, they want to
> set its value to blah." No other diff offered.
>
> You guys may want to look at subversion/svn/conflict-callbacks.c to
> examine the CLI's callback.

Thanks Ben, works like a charm now.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Oct 28 11:29:02 2007

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