equal
deleted
inserted
replaced
2304 stats = mergemod.graft(repo, ctx, ctx.p1(), |
2304 stats = mergemod.graft(repo, ctx, ctx.p1(), |
2305 ['local', 'graft']) |
2305 ['local', 'graft']) |
2306 finally: |
2306 finally: |
2307 repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
2307 repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
2308 # report any conflicts |
2308 # report any conflicts |
2309 if stats and stats[3] > 0: |
2309 if stats[3] > 0: |
2310 # write out state for --continue |
2310 # write out state for --continue |
2311 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
2311 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
2312 repo.vfs.write('graftstate', ''.join(nodelines)) |
2312 repo.vfs.write('graftstate', ''.join(nodelines)) |
2313 extra = '' |
2313 extra = '' |
2314 if opts.get('user'): |
2314 if opts.get('user'): |