[issue940] Merging based on tagged revisions blows away older tags

[Joerg Hartung]

New submission from Joerg Hartung <joerg.hartung at intel.com>:

I found a problem in version 0.9.4, where merges might blow away older tags from
the repository.
In the submitted scenario, one branch is created and tagged, followed by the
creation of a new branch and a subsequent merge of the previously tagged
release. During the tagging process, the tag disappears and cannot be recovered.

This problem can be avoided in two ways:
- Merge based on branches instead of the tag. But that is not what we would like
to use for our methodology.
- Perform an update with the tagged version after creating the tag.

The appropriate lines are contained in the example, commented out.

The same testcase fails entirely on the latest release that I downloaded today
(a893610f6f0c?): The merge does not even complete, saying that there is nothing
to merge.

----------
files: run
messages: 4948
nosy: jhartung
priority: urgent
status: unread
title: Merging based on tagged revisions blows away older tags

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue940>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: run
Type: application/octet-stream
Size: 1001 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20080121/b5188da0/attachment.obj