Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 20620:bedb9f1a6b4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <raf@durin42.com>
date Sat, 01 Mar 2014 21:08:28 -0500
parents abd448767465 b96cb15ec9e0
children 1df033640a8e
comparison
equal deleted inserted replaced
20614:1bc68ff4e0a2 20620:bedb9f1a6b4e
652 merged += 1 652 merged += 1
653 elif m == "d": # directory rename 653 elif m == "d": # directory rename
654 f2, fd, flags = args 654 f2, fd, flags = args
655 if f: 655 if f:
656 repo.ui.note(_("moving %s to %s\n") % (f, fd)) 656 repo.ui.note(_("moving %s to %s\n") % (f, fd))
657 audit(f) 657 audit(fd)
658 repo.wwrite(fd, wctx.filectx(f).data(), flags) 658 repo.wwrite(fd, wctx.filectx(f).data(), flags)
659 util.unlinkpath(repo.wjoin(f)) 659 util.unlinkpath(repo.wjoin(f))
660 if f2: 660 if f2:
661 repo.ui.note(_("getting %s to %s\n") % (f2, fd)) 661 repo.ui.note(_("getting %s to %s\n") % (f2, fd))
662 repo.wwrite(fd, mctx.filectx(f2).data(), flags) 662 repo.wwrite(fd, mctx.filectx(f2).data(), flags)