"Michael S. Tsirkin" <mst@xxxxxxxxxxxxxxxxxx> writes: >> That is to be expected. Operations in sparsely checked out >> trees are meant to minimally checkout what have been touched by >> a merge so that the user can use usual file inspection tools on >> them to see the result. > > Unfortunately, this means that local changes have been discarded. Yes, that is what it means. The original reasoning that we can lose 'deletion' dates back to very early days of git: http://thread.gmane.org/gmane.comp.version-control.git/4641/focus=4646 look for "just delete it again". I do not necessarily think that reasoning is justified today, but one thing that is certain is that this "treat not in index and not modified the same way" is built quite deeply into the plumbing and would take serious amount of work to review and revise. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
