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

Re: [Fwd: svn commit: r33855 - in branches/tree-conflicts-notify/subversion: include libsvn_client libsvn_wc svn tests/cmdline tests/cmdline/svntest]

From: Stephen Butler <sbutler_at_elego.de>
Date: Thu, 23 Oct 2008 21:47:45 +0200

Quoting Julian Foad <julianfoad_at_btopenworld.com>:

> Neels J. Hofmeyr wrote:

>> And I suddenly grasp this: Even in the
>> callbacks, tree_conflicted_p is useful to report any tree-conflicts that
>> have been around before the current operation was launched.
> Yes. Each part of the up/sw/merge operation is trying to say:
> if target was already in conflict:
> skip this action
> else
> if this action will cause a tree conflict:
> record the tree conflict
> skip this action
> else:
> do this action

I assume we'll handle the skipping after we've fixed the output
data and formatting. I'll remove skipping-code from the branch.

There's also some code that prints in the style of 'svn status
--conflicts", e.g. "C(D->M)". I think for up/sw/merge output,
a simple " C" is sufficient. The user can check status
afterward. Also, it makes our patch a lot simpler.

> When svn_wc_conflicted_p2() was ansering "does this path have any
> tree-conflicted children", I thought it was better to separate out that
> question into a separate API, but now that we can answer all three of
> * is there a text conflict on this path?
> * is there a property conflict on this path?
> * is there a tree conflict on this path?
> with one svn_wc_conflicted_p2() API, it seems neat and useful to do so.
> I'm not entirely convinced it's the most useful API in the world: most
> callers of it simply want to know whether there are any conflicts on the
> path, and don't care what they are. But it's OK. Go for it. (First step:
> stop using the current svn_wc_conflicted_p2()'s
> contains-tree-conflicted-children parameter.)

I have a new, more flexible svn_wc_conflicted_p2() ready, will commit
as soon as I straighten out the callers.


Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-23 21:47:59 CEST

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