Mercurial Mercurial > hg-stable / changelog
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | help
(0) -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tue, 17 Nov 2015 15:43:21 -0800 test-resolve.t: switch to mergestate.read()
changeset
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 15:43:21 -0800] rev 26997
test-resolve.t: switch to mergestate.read() See previous patches for why we're doing this.
Tue, 17 Nov 2015 13:58:50 -0800 localrepo.commit: switch to mergestate.read()
changeset
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 13:58:50 -0800] rev 26996
localrepo.commit: switch to mergestate.read() See previous patches for why we're doing this.
Tue, 17 Nov 2015 13:57:38 -0800 fileset: switch to mergestate.read()
changeset
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 13:57:38 -0800] rev 26995
fileset: switch to mergestate.read() See previous patches for why we're doing this.
Tue, 17 Nov 2015 14:20:55 -0800 commands.summary: switch to mergestate.read()
changeset
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 14:20:55 -0800] rev 26994
commands.summary: switch to mergestate.read() See previous patch for why we're doing this. We do this with a bit of care -- it would be bad form for 'hg summary' to abort completely if we encounter an unsupported merge record. Instead just warn about that and continue with the rest of the summary.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 tip
hg-stable