1996 if divergent not in repo[None].parents(): |
1996 if divergent not in repo[None].parents(): |
1997 repo.ui.status(_('updating to "local" conflict\n')) |
1997 repo.ui.status(_('updating to "local" conflict\n')) |
1998 hg.update(repo, divergent.rev()) |
1998 hg.update(repo, divergent.rev()) |
1999 repo.ui.note(_('merging divergent changeset\n')) |
1999 repo.ui.note(_('merging divergent changeset\n')) |
2000 if progresscb: progresscb() |
2000 if progresscb: progresscb() |
2001 if 'partial' in merge.update.__doc__: |
2001 try: |
|
2002 stats = merge.update(repo, |
|
2003 other.node(), |
|
2004 branchmerge=True, |
|
2005 force=False, |
|
2006 ancestor=base.node(), |
|
2007 mergeancestor=True) |
|
2008 except TypeError: |
2002 # Mercurial < 43c00ca887d1 (3.7) |
2009 # Mercurial < 43c00ca887d1 (3.7) |
2003 stats = merge.update(repo, |
2010 stats = merge.update(repo, |
2004 other.node(), |
2011 other.node(), |
2005 branchmerge=True, |
2012 branchmerge=True, |
2006 force=False, |
2013 force=False, |
2007 partial=None, |
2014 partial=None, |
2008 ancestor=base.node(), |
|
2009 mergeancestor=True) |
|
2010 else: |
|
2011 stats = merge.update(repo, |
|
2012 other.node(), |
|
2013 branchmerge=True, |
|
2014 force=False, |
|
2015 ancestor=base.node(), |
2015 ancestor=base.node(), |
2016 mergeancestor=True) |
2016 mergeancestor=True) |
2017 |
2017 |
2018 hg._showstats(repo, stats) |
2018 hg._showstats(repo, stats) |
2019 if stats[3]: |
2019 if stats[3]: |