Allow server to suggest `pull and rebase' instead of `pull and merge'
This issue was imported from Bugzilla (issue6945). # Original description `````````````````````````` For projects with linear history and rebase workflow on trunk, it is confusing when `hg push' suggests merge instead of rebase: $ hg push abort: push creates new remote head f4773da82bc0 (pull and merge or see 'hg help push' for details about pushing new heads) Can the server ask that this message suggest `pull and rebase' or `hg pull --rebase' instead? I can copy & paste reject_new_hooks.py and then edit it so that `hg push -f' reports a different message: $ hg push -f error: pretxnclose.reject_new_heads hook failed: Changes on branch 'default' resulted in multiple heads, try hg pull --rebase transaction abort! rollback completed abort: Changes on branch 'default' resulted in multiple heads But it would be nice if I could do that for `hg push' without `-f' too. `````````````````````````` # Relevant original bug metadata | Field | Value | | --- | --- | | Bug ID | 6945 | | Created on | 2024-12-09T02:09:37Z | | Component | Mercurial | | Reporter | mercurial-bugzilla (Taylor R Campbell) | | Status | UNCONFIRMED | | Resolution | None | | Operating System | NetBSD | | Priority | wish | | Severity | feature | | Mercurial version | 6.8.1 | | Python version | None |
issue