[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 04 Sep 2008 21:16:59 +0100

On Thu, 2008-09-04 at 01:57 +0200, Neels Hofmeyr wrote:
> Julian Foad wrote:
> > 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

OK, you've convinced me. Committed in r32908.

- 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-04 22:17:13 CEST

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