[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-29 18:17:30 CET

Ben Collins-Sussman wrote:
> On 10/29/07, Mark Phippard <markphip@gmail.com> wrote:
>> On 10/29/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
>>> I just tested the CLI: if user A commits a change to 'svn:ignore' on
>>> a directory, and user B makes local mods to the same property, then
>>> when user B updates, the callback is *definitely* called.
>>> I'll take a look at your merge scenario below.
>> For what it's worth I ONLY test with merge. I have not looked at
>> hooking this into the other commands yet.
> FWIW, I've ONLY ever tested with update. I've not looked at merges,
> which is why dlr discovered that the merge code was calling a
> deprecated property-merging routine. :-)

FWIW, I only test with merge too. Because for updates, I just let the
conflict happen.
Imagine someone doing a lengthy update, goes for a coffee until the
update is finished. He returns, and finds that the update was stalled
due to the conflict callback asking for user input.
For the user, it doesn't make much of a difference whether he has to
resolve the conflicts at the end of the update or in between - the
conflicts are the same.
Only for merges it's important to resolve the conflicts right away,
because otherwise further merges could fail.

That's why I only test with merges.


   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 Mon Oct 29 19:06:29 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.