equal
deleted
inserted
replaced
51 cmd = (os.environ.get("HGMERGE") or repo.ui.config("ui", "merge") |
51 cmd = (os.environ.get("HGMERGE") or repo.ui.config("ui", "merge") |
52 or "hgmerge") |
52 or "hgmerge") |
53 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root, |
53 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root, |
54 environ={'HG_FILE': fd, |
54 environ={'HG_FILE': fd, |
55 'HG_MY_NODE': str(wctx.parents()[0]), |
55 'HG_MY_NODE': str(wctx.parents()[0]), |
56 'HG_OTHER_NODE': str(mctx)}) |
56 'HG_OTHER_NODE': str(mctx), |
|
57 'HG_MY_ISLINK': fcm.islink(), |
|
58 'HG_OTHER_ISLINK': fco.islink(), |
|
59 'HG_BASE_ISLINK': fca.islink(),}) |
57 if r: |
60 if r: |
58 repo.ui.warn(_("merging %s failed!\n") % fd) |
61 repo.ui.warn(_("merging %s failed!\n") % fd) |
59 |
62 |
60 os.unlink(b) |
63 os.unlink(b) |
61 os.unlink(c) |
64 os.unlink(c) |