Skip to content
Snippets Groups Projects
Commit 8bfef573 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

filemerge: move 'merging' output to before file creation

This has no visible impact but makes some future work simpler.
parent b4aab422
No related branches found
No related tags found
No related merge requests found
......@@ -493,6 +493,13 @@
if mergetype == nomerge:
return func(repo, mynode, orig, fcd, fco, fca, toolconf)
if orig != fco.path():
ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
else:
ui.status(_("merging %s\n") % fd)
ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
a = repo.wjoin(fd)
b = temp("base", fca)
c = temp("other", fco)
......@@ -500,13 +507,6 @@
util.copyfile(a, back)
files = (a, b, c, back)
if orig != fco.path():
ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
else:
ui.status(_("merging %s\n") % fd)
ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
r = 0
if precheck and not precheck(repo, mynode, orig, fcd, fco, fca,
toolconf):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment