equal
deleted
inserted
replaced
1181 # there were no conficts, mergestate was not stored |
1181 # there were no conficts, mergestate was not stored |
1182 node = repo[b'.'].hex() |
1182 node = repo[b'.'].hex() |
1183 |
1183 |
1184 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) |
1184 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) |
1185 stats = mergemod.update(repo, node, branchmerge=False, force=True) |
1185 stats = mergemod.update(repo, node, branchmerge=False, force=True) |
|
1186 assert stats.unresolvedcount == 0 |
1186 _showstats(repo, stats) |
1187 _showstats(repo, stats) |
1187 return stats.unresolvedcount > 0 |
|
1188 |
1188 |
1189 |
1189 |
1190 def _incoming( |
1190 def _incoming( |
1191 displaychlist, subreporecurse, ui, repo, source, opts, buffered=False |
1191 displaychlist, subreporecurse, ui, repo, source, opts, buffered=False |
1192 ): |
1192 ): |