Re: Tree conflict resolution considered harmful

Chris <devnullaccount_at_yahoo.se> writes:
> [...] The case reported in this thread seems to have the conflict far
> back so I guess that's why the mitigation doesn't work here.

No, it's stuck on a single revision. Look at the timings from the
trace:

    35.021454 r338344
    40.898214 r338059
    40.898328 r333678
    40.898412 r333677
    40.900558 r333490
    77.091446 r333389
    95.000296 r333300
    95.001008 r326169
   671.067538 r322052
   671.337258 r321369
  7240.543297 disconnected

DES

-- 
Dag-Erling Smørgrav - des_at_des.no