[PATCH] merge: improve error messages when aborting because of head count
mpm at selenic.com
Mon Jun 14 16:13:52 CDT 2010
On Mon, 2010-06-14 at 17:06 -0400, Greg Ward wrote:
> # HG changeset patch
> # User Greg Ward <greg-hg at gerg.ca>
> # Date 1276549392 14400
> # Node ID 5d2161258411648e7a2861049979e2b3f1478535
> # Parent 7422ede2bda7c8a786c4f0d1f1e5138219423b95
> merge: improve error messages when aborting because of head count.
> - if > 2 heads on current branch, assume the user wants to merge
> with another head on this branch and tell them how to see
> all branch heads
> - if 1 head on current branch, assume the user wants to merge
> with another branch and show them how to see all repository heads
> ('heads -t')
Still don't get why you think -t is the right thing here. Topological
heads does not include all the heads on other branches.
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel