Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 12369:6f0d9d79111f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: delay writing the mergestate during until commit is called This speeds up merges of lots of files considerably.
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Mon, 06 Sep 2010 17:35:49 +0200
parents f00953d9533c
children f1e8d6f6e682
comparison
equal deleted inserted replaced
12368:9581d5efb6a5 12369:6f0d9d79111f
2988 if ms.resolve(f, wctx, mctx): 2988 if ms.resolve(f, wctx, mctx):
2989 ret = 1 2989 ret = 1
2990 2990
2991 # replace filemerge's .orig file with our resolve file 2991 # replace filemerge's .orig file with our resolve file
2992 util.rename(a + ".resolve", a + ".orig") 2992 util.rename(a + ".resolve", a + ".orig")
2993
2994 ms.commit()
2993 return ret 2995 return ret
2994 2996
2995 def revert(ui, repo, *pats, **opts): 2997 def revert(ui, repo, *pats, **opts):
2996 """restore individual files or directories to an earlier state 2998 """restore individual files or directories to an earlier state
2997 2999