Mattias Engdegård wrote:
> 2 apr 2013 kl. 15.51 skrev Julian Foad:
>> 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.
>
> Quel blamage
2 apr 2013 kl. 15.51 skrev Julian Foad:
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 handl
Mattias Engdegård wrote:
> 29 mar 2013 kl. 03.03 skrev Julian Foad:
>> Mattias Engdegård wrote:
>>> The patch assumes that svn_node_none, svn_node_unknown or
>>> svn_wc_operation_none cannot occur here. Please confirm or refute.
>>
>> I haven't checked whether these can occur in this message. s
29 mar 2013 kl. 03.03 skrev Julian Foad:
Mattias Engdegård wrote:
The patch assumes that svn_node_none, svn_node_unknown or
svn_wc_operation_none
cannot occur here. Please confirm or refute.
I haven't checked whether these can occur in this message.
svn_node_unknown can certainly occur
Mattias Engdegård wrote:
>T he conflict message "local %s %s, incoming %s %s upon %s" in
> svn_cl__get_human_readable_tree_conflict_description is not correctly
> prepared
> for localisation.
[...]
Thanks, Mattias. Your patch certainly looks to me like a good improvement.
> The patch assumes
The conflict message "local %s %s, incoming %s %s upon %s" in
svn_cl__get_human_readable_tree_conflict_description is not correctly
prepared for localisation.
First, two of the parameters are inserted untranslated (in English),
making proper translation impossible; second, piecing together a
6 matches
Mail list logo
