diff --git a/mercurial/.footprint b/mercurial/.footprint
index 45ead5a75..595f7c0e1 100644
--- a/mercurial/.footprint
+++ b/mercurial/.footprint
@@ -135,7 +135,7 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/hgext/zeroconf/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/zeroconf/Zeroconf.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/zeroconf/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/zeroconf/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial-3.0.1-py2.7.egg-info
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial-3.1.2-py2.7.egg-info
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/__init__.py (EMPTY)
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/__init__.pyc
@@ -356,6 +356,8 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/strutil.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/subrepo.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/subrepo.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/tagmerge.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/tagmerge.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/tags.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/tags.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templatefilters.py
diff --git a/mercurial/.md5sum b/mercurial/.md5sum
index 34501d3f4..390250719 100644
--- a/mercurial/.md5sum
+++ b/mercurial/.md5sum
@@ -1 +1 @@
-15de301a673b77f839325dba10ed4fc0  mercurial-3.0.1.tar.gz
+72a79798de828d6d6fb055273f91201a  mercurial-3.1.2.tar.gz
diff --git a/mercurial/Pkgfile b/mercurial/Pkgfile
index 9a7cf1a2a..130533afd 100644
--- a/mercurial/Pkgfile
+++ b/mercurial/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  python
 
 name=mercurial
-version=3.0.1
+version=3.1.2
 release=1
 source=(http://www.selenic.com/$name/release/$name-$version.tar.gz)