Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 5060:2ef14e29e538

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Thu, 02 Aug 2007 13:23:53 -0500
parents bf444a9a9c23 8d9bdcbb2b18
children d316124ebbea
comparison
equal deleted inserted replaced
5057:99a4592ea886 5060:2ef14e29e538
413 else: 413 else:
414 if r is None: 414 if r is None:
415 updated += 1 415 updated += 1
416 else: 416 else:
417 merged += 1 417 merged += 1
418 if f != fd and move: 418 util.set_exec(repo.wjoin(fd), "x" in flags)
419 if f != fd and move and util.lexists(repo.wjoin(f)):
419 repo.ui.debug(_("removing %s\n") % f) 420 repo.ui.debug(_("removing %s\n") % f)
420 os.unlink(repo.wjoin(f)) 421 os.unlink(repo.wjoin(f))
421 util.set_exec(repo.wjoin(fd), "x" in flags)
422 elif m == "g": # get 422 elif m == "g": # get
423 flags = a[2] 423 flags = a[2]
424 repo.ui.note(_("getting %s\n") % f) 424 repo.ui.note(_("getting %s\n") % f)
425 t = mctx.filectx(f).data() 425 t = mctx.filectx(f).data()
426 repo.wwrite(f, t, flags) 426 repo.wwrite(f, t, flags)