hgext/convert/hg.py

37394:65705fbc9c37

                self.repo.rollback(force=True)
                return parent
        return p2

    def puttags(self, tags):
        try:
            tagparent = self.repo[self.tagsbranch].node()
        except error.RepoError:
            tagparent = nodemod.nullid

        oldlines = set()
        for branch, heads in self.repo.branchmap().iteritems():
            for h in heads:
                if '.hgtags' in self.repo[h]:

37395:810413b745ff

                self.repo.rollback(force=True)
                return parent
        return p2

    def puttags(self, tags):
        tagparent = self.repo.branchtip(self.tagsbranch, ignoremissing=True)
        tagparent = tagparent or nodemod.nullid

        oldlines = set()
        for branch, heads in self.repo.branchmap().iteritems():
            for h in heads:
                if '.hgtags' in self.repo[h]: