Matt Mackall <mpm@selenic.com> [Wed, 11 Nov 2015 15:08:08 -0600] rev 26901
merge with stable
Augie Fackler <augie@google.com> [Wed, 04 Nov 2015 12:14:18 -0500] rev 26900
verify: add a hook that can let extensions manipulate file lists
Without a hook of this nature, narrowhg[0] clones always result in 'hg
verify' reporting terrible damage to the entire repository
history. With this hook, we can ignore files that aren't supposed to
be in the clone, and then get an accurate report of any damage present
(or not) in the repo.
0: https://bitbucket.org/Google/narrowhg
Siddharth Agarwal <sid0@fb.com> [Tue, 10 Nov 2015 17:16:59 -0800] rev 26899
resolve: don't abort when file is missing
A file being missing is a completely valid situation in which the user may want
to re-resolve merge conflicts. Mercurial already maintains backups of local
data, so this turns out to be easy to handle.
Siddharth Agarwal <sid0@fb.com> [Tue, 10 Nov 2015 17:13:16 -0800] rev 26898
filemerge: treat EOF at prompt as fail, not abort
Previously we'd abort the merge entirely if there was an EOF at the prompt.
This is unnecessary -- it's much better to simply fail and treat the file as
unresolved instead.