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

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

From: Neels Hofmeyr <neels_at_elego.de>
Date: Thu, 04 Sep 2008 03:05:13 +0200

...and here the missing attachment.

Neels Hofmeyr wrote:
>
> Julian Foad wrote:
>> 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.
>
> thought so :)
> I tried to sneak in a cosmetic change through the back door. ;)
>
>
>> 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:
>
>
> Using the attached testing-patch, I get this output:
>
> [[[
> $ ./update_tests.py 3
> UNEXPECTED EXCEPTION:
> [...]
> KeyError: ('P', 'a', 't', 'h', ' ', "'", 'A', '/', 'D', '/', 'f', 'o', 'o',
> "'", ' ', 'n', 'o', 't', ' ', 'p', 'r', 'e', 's', 'e', 'n', 't', ' ', 'i',
> 'n', ' ', 'W', 'C', ' ', 's', 't', 'a', 't', 'e', ' ', 'd', 'e', 's', 'c',
> 'r', 'i', 'p', 't', 'o', 'r')
> FAIL: update_tests.py 3: update should not munge adds or replaces
> ]]]
>
> Adding the square brackets, this becomes
>
> [[[
> $ ./update_tests.py 3
> UNEXPECTED EXCEPTION:
> [...]
> KeyError: "Path 'A/D/foo' not present in WC state descriptor"
> FAIL: update_tests.py 3: update should not munge adds or replaces
> ]]]
>
> , with quotes around it, as I didn't notice before. I didn't realise it
> might be related to the python version, either.
>
> $ python -V
> Python 2.5.2
>
>
> Thanks for committing the other stuff!
>
> ~Neels
>
>
>
>>> 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
>>
>

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194

Received on 2008-09-04 03:13:45 CEST

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