##// END OF EJS Templates
workingctx: don't report the tags for its parents...
Matt Harbison -
r25688:24cda1dd default
parent child Browse files
Show More
@@ -1247,10 +1247,7 class committablectx(basectx):
1247 return self._extra
1247 return self._extra
1248
1248
1249 def tags(self):
1249 def tags(self):
1250 t = []
1250 return []
1251 for p in self.parents():
1252 t.extend(p.tags())
1253 return t
1254
1251
1255 def bookmarks(self):
1252 def bookmarks(self):
1256 b = []
1253 b = []
@@ -1653,7 +1653,7 working-directory revision requires spec
1653 "date": [*, 0], (glob)
1653 "date": [*, 0], (glob)
1654 "desc": "",
1654 "desc": "",
1655 "bookmarks": [],
1655 "bookmarks": [],
1656 "tags": ["tip"],
1656 "tags": [],
1657 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"]
1657 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"]
1658 }
1658 }
1659 ]
1659 ]
@@ -1677,7 +1677,7 working-directory revision requires spec
1677 "date": [*, 0], (glob)
1677 "date": [*, 0], (glob)
1678 "desc": "",
1678 "desc": "",
1679 "bookmarks": [],
1679 "bookmarks": [],
1680 "tags": ["tip"],
1680 "tags": [],
1681 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
1681 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
1682 "manifest": null,
1682 "manifest": null,
1683 "extra": {"branch": "default"},
1683 "extra": {"branch": "default"},
@@ -416,6 +416,12 check that we can merge tags that differ
416 $ hg ci -A -m0
416 $ hg ci -A -m0
417 adding f0
417 adding f0
418 $ hg tag tbase
418 $ hg tag tbase
419 $ hg up -qr '.^'
420 $ hg log -r 'wdir()' -T "{latesttagdistance}\n"
421 1
422 $ hg up -q
423 $ hg log -r 'wdir()' -T "{latesttagdistance}\n"
424 2
419 $ cd ..
425 $ cd ..
420 $ hg clone repo-automatic-tag-merge repo-automatic-tag-merge-clone
426 $ hg clone repo-automatic-tag-merge repo-automatic-tag-merge-clone
421 updating to branch default
427 updating to branch default
General Comments 0
You need to be logged in to leave comments. Login now