Re: Tree-conflicts: HEADS UP: update failure with tc-siblings :0

Stephen Butler wrote:
> Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:
>
...
>> 4. Steve reverts (2) and says he's onto fixing it by adding an
>> <wc-entry-add-tree-conflict/> instruction to the log (suggested by
>> neels).
...
>> As to "what": I am still convinced that (5) is the best solution.
>
> Do you mean (4)?

Oops, sorry, I did mean (4).

...
> OK, I'll work on (4) this afternoon, make one or two commits or a patch,
> and you can take over this evening.

From the current time I take it you're not still working on it. From a lack
of commits by you or any other mail on this I take it you didn't do any of
that :)

I was still held up with "commit", so I'll see again tomorrow whether you've
committed/posted something.

~Neels