Mercurial > evolve
changeset 1633:9bcb24c3ba8d
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 18 Mar 2016 23:49:32 -0700 |
| parents | 7463f5880ce9 (current diff) 498329a3c900 (diff) |
| children | 9ae4e79a28f3 |
| files | hgext/evolve.py |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Fri Mar 18 16:37:49 2016 -0700 +++ b/hgext/evolve.py Fri Mar 18 23:49:32 2016 -0700 @@ -1129,7 +1129,7 @@ ctx = unfi[rev] parents = tuple(p.node() for p in ctx.parents()) before = len(store._all) - store.create(tr, mark[0], mark[1], mark[2], marks[3], + store.create(tr, mark[0], mark[1], mark[2], mark[3], parents=parents) if len(store._all) - before: ui.write(_('created new markers for %i\n') % rev) @@ -2002,7 +2002,14 @@ hg.update(repo, divergent.rev()) repo.ui.note(_('merging divergent changeset\n')) if progresscb: progresscb() - if merge.update.__doc__ is not None and 'partial' in merge.update.__doc__: + try: + stats = merge.update(repo, + other.node(), + branchmerge=True, + force=False, + ancestor=base.node(), + mergeancestor=True) + except TypeError: # Mercurial < 43c00ca887d1 (3.7) stats = merge.update(repo, other.node(), @@ -2011,13 +2018,6 @@ partial=None, ancestor=base.node(), mergeancestor=True) - else: - stats = merge.update(repo, - other.node(), - branchmerge=True, - force=False, - ancestor=base.node(), - mergeancestor=True) hg._showstats(repo, stats) if stats[3]: