Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 16092:914bc95e227b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: use normal update path with --check (issue2450) This avoids clobbering unknown files on update by not using overwrite mode.
author Matt Mackall <mpm@selenic.com>
date Thu, 09 Feb 2012 13:16:20 -0600
parents fcf66193b186
children 7e30f5f2285f
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Feb 06 15:36:44 2012 -0600
+++ b/mercurial/merge.py	Thu Feb 09 13:16:20 2012 -0600
@@ -558,7 +558,7 @@
                                    " --check to force update)"))
             else:
                 # Allow jumping branches if clean and specific rev given
-                overwrite = True
+                pa = p1
 
         ### calculate phase
         action = []