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

Re: Fwd: Re: svn_wc_get_tree_conflict

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 18 Sep 2008 15:19:03 +0100

> From: Stefan Sperling <stsp_at_elego.de>

> Quick follow-up:
>
> Once the API allows the client library to think in terms of
> individual victims, a patch like the one below would make sense, right?
>
> I know you don't want multiple types of conflicts to co-exist,
> but for now it matches current behaviour.
>
> Oddly enough, the patch only made a single test fail! :)
>
> [[[
> Improve the error reported when a commit fails because of a conflict.
>
> * subversion/libsvn_client/commit_util.c
> (bail_if_conflict): New function which returns an appropriate
> error for a conflict, or combination of conflicts, at a path.
> (harvest_committables): Call bail_if_conflict instead
> of reporting the same error for every type of conflict.
>
> * subversion/tests/cmdline/commit_tests.py
> (tree_conflicts_block_commit): Adjust expected error output.
> ]]]

Hi Stefan.

You could change the words in those messages to match what the code does
now (i.e. instead of "is a victim", write "contains tree conflicts"),
and then commit it.

Later we can make the reporting per-victim and adjust the messages
again.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-18 16:19:22 CEST

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