Re: [PATCH] Make conflict message translatable
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 2 Apr 2013 14:51:45 +0100 (BST)
Mattias Engdegård wrote:
A quick update. I tried your patch and the test suite fails here:
FAIL: upgrade_tests.py 24: wc with add-add and del-del tree conflicts
That's failing in local_reason_str() with kind=none and reason=deleted, so at least we need that function to handle that case.
This indicates that perhaps the only way to get kind=none is an upgrade from a previous WC format. We could handle such unusual cases by constructing a response from the separate parts, and not attempt to use different messages for every possible combination. The important thing is to use well written messages for the common cases. The unusual or impossible cases can just have some inelegant construction like we were doing before, and then we'd be sure to handle any case that might arise rather than throwing an error.
Does that sound good and, if so, would you like to change the patch to do that?
>> My only other suggestion would be to include the comma in the English
This is an archived mail posted to the Subversion Dev mailing list.