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

            Bug ID: 6664
           Summary: Merge of tags causes them to disappear
           Product: Mercurial
           Version: 5.9
          Hardware: PC
                OS: Mac OS
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: Mercurial
          Assignee: bugzi...@mercurial-scm.org
          Reporter: dan...@gmail.com
                CC: mercurial-devel@mercurial-scm.org
    Python Version: ---

I just did a straightforward merge of some tags. When I tried to push them,
Heptapod wouldn't allow me since it reported that it would delete protected
tags. I thought that was a fluke, disabled protection, and pushed anyway. But
the tags really did disappear?!

To see this:

  $ hg clone -r 1.0.x https://foss.heptapod.net/mercurial/hg-git
  destination directory: hg-git
  adding changesets
  adding manifests
  adding file changes
  added 1713 changesets with 3589 changes to 330 files
  new changesets 06366111af3c:70c4a1c3f4d1
  updating to branch 1.0.x
  127 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd hg-git
  $ hg tags | head -3
  tip                             1712:70c4a1c3f4d1
  1.0.0b2.post1                   1711:ff6274c7c614
  1.0.0b2                         1709:d31a72cf70bd
  $ hg pull -r default
  pulling from https://foss.heptapod.net/mercurial/hg-git
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 3 changesets with 0 changes to 0 files
  new changesets 95dfb22bc4ac:a99815f42acd
  (run 'hg update' to get a working copy)
  $ hg tags | head -3
  tip                             1715:a99815f42acd
  1.0.0b1                         1696:311e9a57959e
  0.10.4                          1691:bc5339fcea1e
  $ hg diff -r 95dfb22bc4ac:a99815f42acd .hgtags
  diff -r 95dfb22bc4ac -r a99815f42acd .hgtags
  --- a/.hgtags Wed Jan 26 22:33:58 2022 +0100
  +++ b/.hgtags Thu Mar 10 18:09:32 2022 +0100
  @@ -43,3 +43,5 @@
   f39e71f82bc68672ffc14ab4ed7e61a3f31c9056 0.10.4
   bc5339fcea1e1b149602ffc2a06a3626dc44d2f4 0.10.4
   311e9a57959e5a725c1a0b73f95f2c80161760ef 1.0.0b1
  +d31a72cf70bd402aa5d3d4270871fff83ac47cd0 1.0.0b2
  +ff6274c7c614f0a6b1e6568c16c9f882ea7c4bc7 1.0.0b2.post1

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to