[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 23 Oct 2008 22:26:32 +0100

On Thu, 2008-10-23 at 21:47 +0200, Stephen Butler wrote:
> 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.

I'm working on skipping conflicted trees during update/switch.

> 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.

I agree that a simple " C" is sufficient reporting for up/sw/merge.

> >
> [...]
> > 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.

Can I see the doc string and prototype?

- Julian

> Steve
>

---------------------------------------------------------------------
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 23:26:54 CEST

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