equal
deleted
inserted
replaced
2016 def postincoming(ui, repo, modheads, optupdate): |
2016 def postincoming(ui, repo, modheads, optupdate): |
2017 if modheads == 0: |
2017 if modheads == 0: |
2018 return |
2018 return |
2019 if optupdate: |
2019 if optupdate: |
2020 if modheads == 1: |
2020 if modheads == 1: |
2021 return hg.update(repo, repo.changelog.tip()) # update |
2021 return hg.update(repo, None) |
2022 else: |
2022 else: |
2023 ui.status(_("not updating, since new heads added\n")) |
2023 ui.status(_("not updating, since new heads added\n")) |
2024 if modheads > 1: |
2024 if modheads > 1: |
2025 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
2025 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
2026 else: |
2026 else: |