[issue1916] hg bails when ) 1) forget to pull/update 2) commit/push specific files only 3) pull/update
bugs at mercurial.selenic.com
Fri Nov 20 15:17:21 CST 2009
New submission from Ben Bucksch <linux.news at bucksch.org>:
# Create test project
hg init proj/
hg add *txt
# Check out as developer and start some work
hg clone proj src
# Some other dev does work at the same time, and checks in
hg clone proj/ otherdev
# Back to yourself
# Make some other, unrelated change and try to commit it
hg commit foo.txt
"Canceled: ...creates new remote heads..."
# OK, you're not up-to-date, fine, so update:
"Canceled: ... crosses branches (use 'hg merge' to merge or use 'hg update
-C' to discard changes)"
Now, try to sort that out, as a hg newbie, without removing your other local
work in foo.txt.
It's obvious that in this case, there's no actual problem and hg just
chickens. The touched files have absolutely nothing in common. Now imagine
the same with entirely unrelated changes in different directories /
submodules. This is a very common case, I run into it all the time with a
busy project. And entirely unnecessary - there is no conflict, neither in
files nor inherently.
title: hg bails when ) 1) forget to pull/update 2) commit/push specific files only 3) pull/update
Mercurial issue tracker <bugs at mercurial.selenic.com>
More information about the Mercurial-devel