Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 26990:11b1832db8ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.applyupdates: switch to mergestate.clean() See the previous patches for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 17:04:53 -0800
parents 416b2b7d3068
children 2ddc92bae4a7
comparison
equal deleted inserted replaced
26989:a65ea44f163e 26990:11b1832db8ae
851 Return a tuple of counts (updated, merged, removed, unresolved) that 851 Return a tuple of counts (updated, merged, removed, unresolved) that
852 describes how many files were affected by the update. 852 describes how many files were affected by the update.
853 """ 853 """
854 854
855 updated, merged, removed, unresolved = 0, 0, 0, 0 855 updated, merged, removed, unresolved = 0, 0, 0, 0
856 ms = mergestate(repo) 856 ms = mergestate.clean(repo, wctx.p1().node(), mctx.node())
857 ms.reset(wctx.p1().node(), mctx.node())
858 moves = [] 857 moves = []
859 for m, l in actions.items(): 858 for m, l in actions.items():
860 l.sort() 859 l.sort()
861 860
862 # prescan for merges 861 # prescan for merges