Re: [PATCH] Tree-conflicts: do_entry_deletion segfault

Julian Foad wrote:
> Bear in mind that "reported as" and "stored as" are two completely
> different things. I'm not intending to change the storage, only the
> reporting. The storage can stay in the parent directory.

Oh, I see. In that case...:

One day, stsp and I were discussing the _reporting_ of tree conflicts, and
thought that maybe victims and storage holder (i.e. parent directory) should
have distinct markings; C for parent dir, as in "conflicted", and V for an
actual victim node where the conflict manifested.

We also thought it would be nice to have an additional column for tree
conflicts, to be able to still see the other markings on the
tree-conflict-marked files.

What do you (all) think?

~Neels

BTW, my girls and I are leaving on monday for a three-months' stay in
Seville, so I'm not getting much work done these days. It should get better
after Monday.

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194