[darcs-devel] [patch1826] v3: resolve conflicts

[Ben Franksen]

Ben Franksen <ben.franksen at online.de> added the comment:

>>> {-
>>> Keep this code as a reminder that we want to QC test conflict resolution.
>>> It doesn't work like this anymore, though, we need a full repo. Also should
>>> do it generically for all patch types i.e. in Darcs.Test.Patch.Properties.Gewneric.
>>
>> I guess this should at least have a TODO/V3INTEGRATION comment.
> 
> Yes, definitely. I had completely forgotten about this out-commented code.
> 
>> I'm also
>> generally in favour of leaving code disabled rather than commented out
>> so it keeps compiling, but that's not very important in this case as the
>> code is just an indication of how a future test might look.
> 
> I have written this test a while ago (not yet sent) and it certainly did
> uncover some bugs in my conflict resolution code for V3. (So I did not
> forget we need the test, just the old code and my comment.) The
> commented code can be deleted; I will send that along with the new tests.

I think it makes more sense to gather these patches in a separate
bundle, along with other tests I added and one or two that needed fixing.

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1826>
__________________________________