[python-committers] 3.2 branch in mercurial
Senthil Kumaran
senthil at uthcode.com
Wed Jan 4 07:10:12 CET 2012
I think, there is something wrong with state of hg.python.org at the moment.
On a fresh clone from hg.python.org
$hg clone ssh://hg@hg.python.org/cpython cpython
If I do, hg branches, the 3.2 is shown as inactive. Did something
change recently?
(env27)bash-3.2$ hg branches
default 74263:8f7c4b16c8d7
2.7 74256:789d59773801
3.2 74262:b8f978aa2614 (inactive)
3.1 74253:fb5707168351 (inactive)
2.6 73245:62fa61f2ee7d (inactive)
2.5 73244:b48e1b48e670 (closed)
3.0 68249:4cd9f5e89061 (closed)
legacy-trunk 68241:b77918288f7d (closed)
2.4 68239:ceec209b26d4 (closed)
2.3 68237:364638d6434d (closed)
2.2 68235:61b0263d6881 (closed)
2.1 68233:e849d484029f (closed)
2.0 68231:5fd74354d73b (closed)
The problem is when I clone cpython to 3.2, update 3.2, make changes,
commit , it creates a new head when I try to commit, it asks me to
merge
Workflow (which is supposed to work seamlessly and had been working
till my last commit a week ago).
$hg clone cpython 3.2
$cd 3.2
$hg update 3.2
$hg branch
3.2
$#make changes
$hg commit
# gives a msg saying one head created. Which is wrong.
$hg push
...
searching for changes
abort: push creates new remote heads!
(did you forget to merge? use push -f to force)
Was there any wrong merge? Or am I doing something wrong?
--
Senthil
More information about the python-committers
mailing list