equal
deleted
inserted
replaced
1847 "| You should contact your local evolution Guru for help.\n" |
1847 "| You should contact your local evolution Guru for help.\n" |
1848 % (divergent, othersstr)) |
1848 % (divergent, othersstr)) |
1849 ui.write_err(msg) |
1849 ui.write_err(msg) |
1850 return 2 |
1850 return 2 |
1851 other = others[0] |
1851 other = others[0] |
1852 if divergent.phase() <= phases.public: |
|
1853 msg = _("skipping %s: we can't resolve divergence from the public side\n") % divergent |
|
1854 ui.write_err(msg) |
|
1855 hint = _("(%s is public, try from %s)\n" % (divergent, other)) |
|
1856 ui.write_err(hint) |
|
1857 return 2 |
|
1858 if len(other.parents()) > 1: |
1852 if len(other.parents()) > 1: |
1859 msg = _("skipping %s: divergent changeset can't be a merge (yet)\n" % divergent) |
1853 msg = _("skipping %s: divergent changeset can't be a merge (yet)\n" % divergent) |
1860 ui.write_err(msg) |
1854 ui.write_err(msg) |
1861 hint = _("You have to fallback to solving this by hand...\n" |
1855 hint = _("You have to fallback to solving this by hand...\n" |
1862 "| This probably means redoing the merge and using \n" |
1856 "| This probably means redoing the merge and using \n" |