[issue1170] "hg fetch" merges on wrong named branch

Antoine Pitrou mercurial-bugs at selenic.com
Sun Jun 8 09:58:33 UTC 2008


New submission from Antoine Pitrou <pitrou at free.fr>:

An annoying bug with "hg fetch". I have a repo with two named branches. The
current and only active branch is "binaryio", the inactive one is "py3k" (that
is, "binaryio" is used to maintain some modifications against "py3k"). Also, the
parent repository only contains branch "py3k".

Therefore, by running "hg fetch", I expect Mercurial to pull all new revs in the
"py3k" branch from the parent repo, then to switch back to "binaryio" branch
(which was the selected branch at the start) and produced the merged revision on
this branch. Unfortunately "hg fetch" produces the merged revision on branch
"py3k", which makes "hg fetch" useless:

$ hg id
aa987f3c6908 (binaryio) tip
$ hg branches
binaryio                       1580:aa987f3c6908
py3k                           1577:fccc4a5007e5 (inactive)
$ hg fetch
pulling from /home/antoine/py3k/py3k
searching for changes
adding changesets
adding manifests
adding file changes
added 204 changesets with 1607 changes to 987 files (+1 heads)
updating to 1784:06eebc9f11f6
948 files updated, 0 files merged, 424 files removed, 0 files unresolved
merging with 1580:aa987f3c6908
merging Lib/io.py
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
new changeset 1785:184d66e3736e merges remote changes with local
$ hg tip
changeset:   1785:184d66e3736e
branch:      py3k
tag:         tip
parent:      1784:06eebc9f11f6
parent:      1580:aa987f3c6908
user:        Antoine Pitrou <antoine at p.i.t.r.o.u.net>
date:        Sun Jun 08 11:51:33 2008 +0200
summary:     Automated merge with file:///home/antoine/py3k/py3k


(also, it seems to me that "hg fetch" was doing the right thing in some previous
versions of Mercurial)

----------
messages: 6224
nosy: pitrou
priority: bug
status: unread
title: "hg fetch" merges on wrong named branch
topic: merge, named branches

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1170>
____________________________________________________




More information about the Mercurial-devel mailing list