Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
16090:e1d8218d733b 16092:914bc95e227b
556 elif onode is None: 556 elif onode is None:
557 raise util.Abort(_("crosses branches (merge branches or update" 557 raise util.Abort(_("crosses branches (merge branches or update"
558 " --check to force update)")) 558 " --check to force update)"))
559 else: 559 else:
560 # Allow jumping branches if clean and specific rev given 560 # Allow jumping branches if clean and specific rev given
561 overwrite = True 561 pa = p1
562 562
563 ### calculate phase 563 ### calculate phase
564 action = [] 564 action = []
565 wc.status(unknown=True) # prime cache 565 wc.status(unknown=True) # prime cache
566 folding = not util.checkcase(repo.path) 566 folding = not util.checkcase(repo.path)