I (Julian Foad) wrote on 2013-04-25:
> I (Julian Foad) wrote:
>> There is a second bug, closely related. If there are multiple prop
>> conflicts on the same node, they all get marked as resolved as soon
>> as you request any one of them to be marked as resolved. There is
>> incomplete API suppor
I (Julian Foad) wrote:
> I (Julian Foad) wrote on 2013-04-15:
>> Mattias Engdegård wrote:
>>> If a file has both text and property conflicts, only resolving one of
>>> them leads to an incorrect conflict summary message.
[...]
> The solution I'm implementing is to make the conflict resolver callba
I (Julian Foad) wrote on 2013-04-15:
> Mattias Engdegård wrote:
>> If a file has both text and property conflicts, only resolving one of them
>> leads to an incorrect conflict summary message.
>
> I'll take this one. There's a bunch of stuff to sort out, here; marking
> both conflicts as resolv
Mattias Engdegård wrote:
> If a file has both text and property conflicts, only resolving one of them
> leads
> to an incorrect conflict summary message.
I'll take this one. There's a bunch of stuff to sort out, here; marking both
conflicts as resolved at the same time is only one of the bugs
If a file has both text and property conflicts, only resolving one of
them leads to an incorrect conflict summary message. Example:
$ svnadmin create repo
$ svn co file://$PWD/repo d1
$ svn co file://$PWD/repo d2
$ cd d1
$ echo a > f; svn add f; svn ps p x f
$ svn ci -m m
$ cd ../d2
$ echo b >
5 matches
Mail list logo
