[Bug 5835] New: hg tag --remove does not actually remove the tag when there is a conflict with closed heads

mercurial-bugs at mercurial-scm.org mercurial-bugs at mercurial-scm.org
Wed Apr 4 21:28:52 UTC 2018


https://bz.mercurial-scm.org/show_bug.cgi?id=5835

            Bug ID: 5835
           Summary: hg tag --remove does not actually remove the tag when
                    there is a conflict with closed heads
           Product: Mercurial
           Version: unspecified
          Hardware: PC
                OS: Mac OS
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at mercurial-scm.org
          Reporter: sean at farley.io
                CC: mercurial-devel at mercurial-scm.org

Imagine a repo with only a few open branches (but more importantly) many closed
branches that have never been merged. There is a corner case (working on a
proof-of-concept repo to reproduce but leaving this here for now) where
removing the tag (even on every open head) does not actually remove the tag.

The problem seems to be how we resolve the 'tag merge' in the case of
conflicts. In this particular case, I would think closed heads are weighted
less than, say, default or other open heads.

There is a possibility that there is a minor bug in the pseudo-merge code but I
will need to investigate more.

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list