Re: tree-conflicts: please review to determine desired behaviour in detail

On Tue, 2008-09-02 at 04:24 +0200, Neels Hofmeyr wrote:
> :/
>
> I found yet another small error in the patch:
> It should say status='C ' instead of 'C'. I had fixed one of them, but
> overlooked the four others.

Thanks, Neels. I have committed this version of your patch in r32846.

I didn't apply this bit to the branch:

> * subversion/tests/cmdline/svntest/wc.py (tweak): Wrap an error message in
> square brackets so that it is printed as string and not as an array with
> character items.

because it's unrelated to tree conflicts. I looked at applying it on the
trunk, but I couldn't reproduce a problem with it. I see no difference:

> e.args = "Path '%s' not present in WC state descriptor" % path

> KeyError: Path 'A/mu2' not present in WC state descriptor

> e.args = ["Path '%s' not present in WC state descriptor" % path]

> KeyError: Path 'A/mu2' not present in WC state descriptor

Maybe it depends on a specific version of Python. My version is Python
2.4.2. What did you see?

If interested, see
<http://mail.python.org/pipermail/python-dev/2002-September/028547.html>
in which Guido van Rossum says args[0] should be the actual key that
failed, and <http://bugs.python.org/issue2651> which claims the present
behaviour of KeyError is not documented an proposes a change.

If this is just about having quotation marks around the string, and
behaves differently in different versions of Python, perhaps we can just
forget about it :-)

- 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-02 11:06:58 CEST