##// END OF EJS Templates
abort: removed labels argument from abortmerge()...
Taapas Agrawal -
r42810:209f2b8a default
parent child Browse files
Show More
@@ -957,7 +957,7 b' def merge(repo, node, force=None, remind'
957 """Branch merge with node, resolving changes. Return true if any
957 """Branch merge with node, resolving changes. Return true if any
958 unresolved conflicts."""
958 unresolved conflicts."""
959 if abort:
959 if abort:
960 return abortmerge(repo.ui, repo, labels=labels)
960 return abortmerge(repo.ui, repo)
961
961
962 stats = mergemod.update(repo, node, branchmerge=True, force=force,
962 stats = mergemod.update(repo, node, branchmerge=True, force=force,
963 mergeforce=mergeforce, labels=labels)
963 mergeforce=mergeforce, labels=labels)
@@ -969,7 +969,7 b' def merge(repo, node, force=None, remind'
969 repo.ui.status(_("(branch merge, don't forget to commit)\n"))
969 repo.ui.status(_("(branch merge, don't forget to commit)\n"))
970 return stats.unresolvedcount > 0
970 return stats.unresolvedcount > 0
971
971
972 def abortmerge(ui, repo, labels=None):
972 def abortmerge(ui, repo):
973 ms = mergemod.mergestate.read(repo)
973 ms = mergemod.mergestate.read(repo)
974 if ms.active():
974 if ms.active():
975 # there were conflicts
975 # there were conflicts
@@ -980,8 +980,7 b' def abortmerge(ui, repo, labels=None):'
980
980
981 repo.ui.status(_("aborting the merge, updating back to"
981 repo.ui.status(_("aborting the merge, updating back to"
982 " %s\n") % node[:12])
982 " %s\n") % node[:12])
983 stats = mergemod.update(repo, node, branchmerge=False, force=True,
983 stats = mergemod.update(repo, node, branchmerge=False, force=True)
984 labels=labels)
985 _showstats(repo, stats)
984 _showstats(repo, stats)
986 return stats.unresolvedcount > 0
985 return stats.unresolvedcount > 0
987
986
General Comments 0
You need to be logged in to leave comments. Login now