Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 18612 0b6e6eacc939
parent 18611 18c2184c27dc
child 18630 9b9e2d9e83a1 
--- a/mercurial/merge.py	Sat Feb 09 21:24:24 2013 +0000
+++ b/mercurial/merge.py	Sat Feb 09 21:24:36 2013 +0000
@@ -200,6 +200,8 @@
         pa = wctx
     elif pa == p2: # backwards
         pa = wctx.p1()
+    elif not branchmerge and not wctx.dirty(missing=True):
+        pass
     elif pa and repo.ui.configbool("merge", "followcopies", True):
         ret = copies.mergecopies(repo, wctx, p2, pa)
         copy, movewithdir, diverge, renamedelete = ret
Mercurial