equal
deleted
inserted
replaced
2022 |
2022 |
2023 def postincoming(ui, repo, modheads, optupdate): |
2023 def postincoming(ui, repo, modheads, optupdate): |
2024 if modheads == 0: |
2024 if modheads == 0: |
2025 return |
2025 return |
2026 if optupdate: |
2026 if optupdate: |
2027 if modheads == 1: |
2027 if modheads <= 1: |
2028 return hg.update(repo, None) |
2028 return hg.update(repo, None) |
2029 else: |
2029 else: |
2030 ui.status(_("not updating, since new heads added\n")) |
2030 ui.status(_("not updating, since new heads added\n")) |
2031 if modheads > 1: |
2031 if modheads > 1: |
2032 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
2032 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |