--- a/components/mercurial/mercurial-PYVER.p5m	Tue Feb 03 13:01:27 2015 -0800
+++ b/components/mercurial/mercurial-PYVER.p5m	Fri Feb 06 14:10:05 2015 -0800
@@ -18,6 +18,8 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
@@ -28,12 +30,14 @@
     value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
 set name=com.oracle.info.description \
     value="the Mercurial source control management system"
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2006/417
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
 link path=usr/bin/hg target=hg-$(PYVER) mediator=python \
     mediator-version=$(PYVER)
 file path=usr/bin/hg-$(PYVER)
@@ -75,7 +79,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight/highlight.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/histedit.py
-file path=usr/lib/python$(PYVER)/vendor-packages/hgext/interhg.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/keyword.py
 dir  path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/__init__.py
@@ -118,6 +121,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/bdiff.so
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/bookmarks.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/branchmap.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/bundle2.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/bundlerepo.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/byterange.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/changegroup.py
@@ -131,13 +135,13 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagparser.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/demandimport.py
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dicthelpers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/diffhelpers.so
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dirstate.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/discovery.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dispatch.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/encoding.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/error.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/exchange.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/extensions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/fancyopts.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/filelog.py
@@ -246,6 +250,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/parser.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/parsers.so
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/patch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pathutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/peer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/phases.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/posix.py
@@ -270,6 +275,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/store.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/strutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/subrepo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/tagmerge.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/tags.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templatefilters.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templatekw.py
@@ -448,6 +454,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/windows.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/wireproto.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/worker.py
+#
+license mercurial.copyright.excanvas license="Apache v2.0"
 license mercurial.copyright.google license="BSD 3-Clause"
 license mercurial.copyright license=GPLv2+