1127 rev = nm.get(mark[0]) |
1127 rev = nm.get(mark[0]) |
1128 if rev is not None: |
1128 if rev is not None: |
1129 ctx = unfi[rev] |
1129 ctx = unfi[rev] |
1130 parents = tuple(p.node() for p in ctx.parents()) |
1130 parents = tuple(p.node() for p in ctx.parents()) |
1131 before = len(store._all) |
1131 before = len(store._all) |
1132 store.create(tr, mark[0], mark[1], mark[2], marks[3], |
1132 store.create(tr, mark[0], mark[1], mark[2], mark[3], |
1133 parents=parents) |
1133 parents=parents) |
1134 if len(store._all) - before: |
1134 if len(store._all) - before: |
1135 ui.write(_('created new markers for %i\n') % rev) |
1135 ui.write(_('created new markers for %i\n') % rev) |
1136 ui.progress(pgop, idx, total=pgtotal) |
1136 ui.progress(pgop, idx, total=pgtotal) |
1137 tr.close() |
1137 tr.close() |
2000 if divergent not in repo[None].parents(): |
2000 if divergent not in repo[None].parents(): |
2001 repo.ui.status(_('updating to "local" conflict\n')) |
2001 repo.ui.status(_('updating to "local" conflict\n')) |
2002 hg.update(repo, divergent.rev()) |
2002 hg.update(repo, divergent.rev()) |
2003 repo.ui.note(_('merging divergent changeset\n')) |
2003 repo.ui.note(_('merging divergent changeset\n')) |
2004 if progresscb: progresscb() |
2004 if progresscb: progresscb() |
2005 if merge.update.__doc__ is not None and 'partial' in merge.update.__doc__: |
2005 try: |
|
2006 stats = merge.update(repo, |
|
2007 other.node(), |
|
2008 branchmerge=True, |
|
2009 force=False, |
|
2010 ancestor=base.node(), |
|
2011 mergeancestor=True) |
|
2012 except TypeError: |
2006 # Mercurial < 43c00ca887d1 (3.7) |
2013 # Mercurial < 43c00ca887d1 (3.7) |
2007 stats = merge.update(repo, |
2014 stats = merge.update(repo, |
2008 other.node(), |
2015 other.node(), |
2009 branchmerge=True, |
2016 branchmerge=True, |
2010 force=False, |
2017 force=False, |
2011 partial=None, |
2018 partial=None, |
2012 ancestor=base.node(), |
|
2013 mergeancestor=True) |
|
2014 else: |
|
2015 stats = merge.update(repo, |
|
2016 other.node(), |
|
2017 branchmerge=True, |
|
2018 force=False, |
|
2019 ancestor=base.node(), |
2019 ancestor=base.node(), |
2020 mergeancestor=True) |
2020 mergeancestor=True) |
2021 |
2021 |
2022 hg._showstats(repo, stats) |
2022 hg._showstats(repo, stats) |
2023 if stats[3]: |
2023 if stats[3]: |