[issue2778] convert puts tag on the wrong branch
Faheem Mitha
bugs at mercurial.selenic.com
Mon Apr 25 19:33:21 UTC 2011
New submission from Faheem Mitha <faheem at email.unc.edu>:
This is essentially a copy of http://thread.gmane.org/gmane.comp.version-
control.mercurial.general/26151 since I'm fairly sure it is a bug.
rm -r tag/ tag-conv
hg init tag
cd tag
echo "line added in default branch" >> f
hg add f
hg ci -m "adding f in default branch"
mkdir d
echo "line added in default branch" >> d/foo
hg add d/foo
hg ci -m "adding foo in default branch"
hg branch b
echo "line added in b branch" >> d/bar
hg ci -m "adding bar in b branch"
hg up default
echo "further line added in default branch" >> d/foo
hg ci -m "foo update in default branch"
hg up b
hg merge default
hg ci -m "branch merge with default"
hg tag -m "version 1.0" 1.0
cd ..
hg convert --filemap tag_filemap tag tag-conv
The tag_filemap file is simply
exclude d
The log for tag-conv is as follows. The tag was placed on the b branch,
but in the converted repo it is showing up on the default branch.
$ hg log -v -R tag
changeset: 5:ae84b44f6d8c
branch: b
tag: tip
user: Faheem Mitha <faheem <at> email.unc.edu>
date: Thu Apr 21 21:09:54 2011 +0530
files: .hgtags
description:
version 1.0
changeset: 4:b5d2f25522a3
branch: b
tag: 1.0
parent: 2:597da88ec7e7
parent: 3:529cac4898f1
user: Faheem Mitha <faheem <at> email.unc.edu>
date: Thu Apr 21 21:09:54 2011 +0530
description:
branch merge with default
[...]
$ hg log -v -R tag-conv
changeset: 2:b245aa5557b7
tag: tip
parent: 0:048cff7fbd13
user: convert-repo
date: Thu Apr 21 10:09:55 2011 +0000
files: .hgtags
description:
update tags
changeset: 1:33c89b0d987d
branch: b
user: Faheem Mitha <faheem <at> email.unc.edu>
date: Thu Apr 21 21:09:54 2011 +0530
files: .hgtags
description:
version 1.0
changeset: 0:048cff7fbd13
tag: 1.0
user: Faheem Mitha <faheem <at> email.unc.edu>
date: Thu Apr 21 21:09:53 2011 +0530
files: f
description:
adding f in default branch
----------
messages: 16100
nosy: faheem, pmezard
priority: bug
status: unread
title: convert puts tag on the wrong branch
topic: convert
____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2778>
____________________________________________________
More information about the Mercurial-devel
mailing list