[PATCH 13 of 21 RFC] merge: linear updates to censored data revisions produce empty files

[Matt Mackall]

On Wed, 2014-09-10 at 20:26 -0400, michaeljedgar at gmail.com wrote:
> # HG changeset patch
> # User Mike Edgar <adgar at google.com>
> # Date 1410322526 14400
> #      Wed Sep 10 00:15:26 2014 -0400
> # Node ID 4004f1fed45d6ea2a88272895a5e12ccf28cad0c
> # Parent  c81c9a42fb6f1b2f402e4e6607fe2a531469b08e
> merge: linear updates to censored data revisions produce empty files
> 
> The same configuration check done in verify is done in update to determine if
> the update should be rejected or should substitute the empty file.

Also too burdensome. This needs a helper (perhaps a method on filectx).

-- 
Mathematics is the supreme nostalgia of our time.