Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 4497:22ebd6ee5672
merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 04 Jun 2007 00:26:53 -0300 |
parents | e8a584067825 99f411ba0380 |
children | e0bc2c575044 |
comparison
equal
deleted
inserted
replaced
4496:b79cdb7f0597 | 4497:22ebd6ee5672 |
---|---|
301 an, ah = nh | 301 an, ah = nh |
302 bn, bh = globaltags[k] | 302 bn, bh = globaltags[k] |
303 if bn != an and an in bh and \ | 303 if bn != an and an in bh and \ |
304 (bn not in ah or len(bh) > len(ah)): | 304 (bn not in ah or len(bh) > len(ah)): |
305 an = bn | 305 an = bn |
306 ah.append([n for n in bh if n not in ah]) | 306 ah.extend([n for n in bh if n not in ah]) |
307 globaltags[k] = an, ah | 307 globaltags[k] = an, ah |
308 | 308 |
309 # read the tags file from each head, ending with the tip | 309 # read the tags file from each head, ending with the tip |
310 f = None | 310 f = None |
311 for rev, node, fnode in self._hgtagsnodes(): | 311 for rev, node, fnode in self._hgtagsnodes(): |