[PATCH 1 of 3] largefiles: fix commit of missing largefiles

Danek Duvall danek.duvall at oracle.com
Tue Jan 19 17:42:52 CST 2016


Mads Kiilerich wrote:

> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1453047812 -3600
> #      Sun Jan 17 17:23:32 2016 +0100
> # Node ID 92c424a25cce00c7af68b3d0c489d648a967815a
> # Parent  0029c2bebc23182c34f83fa22abde1d5d4aebc51
> largefiles: fix commit of missing largefiles
> 
> 832c98d79587 improved merging of standin files referencing missing largefiles.
> It did however not test or fix commits of such merges; it would abort.
> 
> To fix that, change copytostore to skip and warn about missing largefiles
> with a message similar the one for failing get from remote filestores. (It
> would perhaps in both cases be better to emit a more helpful warning like
> "warning: standin file for large1 references 58e24f733a which can't be found in
> the local store".)
> 
> To test this, make sure commit doesn't find the "missing" largefile in the global
> usercache. For further testing, verify that update and status works as expected
> after this.
> 
> This will also effectively backout 63116d47cc3f.

Thanks for poking at this; I can confirm that this fixes the test on
Solaris.

Danek


More information about the Mercurial-devel mailing list