Actual behavior. update_editor.c, line 3590. When a tree conflict is
detected for a file, it sets fb->skipped. When apply_textdelta() is
called, the incoming delta is discarded. Thus... we have lost
omicron_at_4.
Desired behavior would be to keep it as the "revert base".
Cheers,
-g
On Wed, Apr 22, 2009 at 16:53, Paul Burba <ptburba_at_gmail.com> wrote:
>...
> Hi Greg,
>
> I follow most of what you two are discussing, except this part about
> skipping. Are you describing desired or actual behavior here? Or
> something else entirely?
>
> Paul
>
>>> Point being: I don't care about fixing bugs in wc-1 anymore.
>>> Make wc-ng do the right thing. You already have the right behaviour
>>> in your head, so if you can, please make wc-ng do the right thing.
>>
>> I worry about an add/add conflict in 1.6, and leaving working copies
>> in a broken state. At a minimum, it would be nice to have an issue
>> filed and a test constructed. (/me looks at pburba...)
>>
>> For wc-ng, I will see that it does the right thing. Thanks.
>>
>> Cheers,
>> -g
>>
>> ------------------------------------------------------
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1858850
>>
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1862100
Received on 2009-04-22 17:35:36 CEST