equal
deleted
inserted
replaced
377 Extensions can wrap this function and write additional entries to |
377 Extensions can wrap this function and write additional entries to |
378 destrepo/.hg/shared to indicate additional pieces of data to be shared. |
378 destrepo/.hg/shared to indicate additional pieces of data to be shared. |
379 """ |
379 """ |
380 default = defaultpath or sourcerepo.ui.config(b'paths', b'default') |
380 default = defaultpath or sourcerepo.ui.config(b'paths', b'default') |
381 if default: |
381 if default: |
382 template = b'[paths]\n' b'default = %s\n' |
382 template = b'[paths]\ndefault = %s\n' |
383 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default)) |
383 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default)) |
384 if repositorymod.NARROW_REQUIREMENT in sourcerepo.requirements: |
384 if repositorymod.NARROW_REQUIREMENT in sourcerepo.requirements: |
385 with destrepo.wlock(): |
385 with destrepo.wlock(): |
386 narrowspec.copytoworkingcopy(destrepo) |
386 narrowspec.copytoworkingcopy(destrepo) |
387 |
387 |
1180 node = ms.localctx.hex() |
1180 node = ms.localctx.hex() |
1181 else: |
1181 else: |
1182 # there were no conficts, mergestate was not stored |
1182 # there were no conficts, mergestate was not stored |
1183 node = repo[b'.'].hex() |
1183 node = repo[b'.'].hex() |
1184 |
1184 |
1185 repo.ui.status( |
1185 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) |
1186 _(b"aborting the merge, updating back to" b" %s\n") % node[:12] |
|
1187 ) |
|
1188 stats = mergemod.update(repo, node, branchmerge=False, force=True) |
1186 stats = mergemod.update(repo, node, branchmerge=False, force=True) |
1189 _showstats(repo, stats) |
1187 _showstats(repo, stats) |
1190 return stats.unresolvedcount > 0 |
1188 return stats.unresolvedcount > 0 |
1191 |
1189 |
1192 |
1190 |