pidgin: 6b89b377: 2008.08.10 - csyfek <csyfek(at)gmail.com...
rlaager at wiktel.com
Mon Aug 11 15:11:06 EDT 2008
On Mon, 2008-08-11 at 03:23 -0400, Elliott Sales de Andrade wrote:
> Ah, I see. But for me, I have two heads, one my commit, and one from
> csyfek. If his was disapproved and then that merged with mine, would
> it then pick up the history?
If you delete a file, it is gone, regardless of any merges. This is the
"die-die-die" merge algorithm. Fixing it is on the Monotone TODO list,
but is complicated. (If this has been done since I last checked, that'd
be amazing, but I haven't heard of it being fixed.)
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 189 bytes
Desc: This is a digitally signed message part
More information about the Devel