summaryrefslogtreecommitdiff
path: root/devel/py-mercurial
diff options
context:
space:
mode:
authorwiz <wiz>2014-09-03 09:56:36 +0000
committerwiz <wiz>2014-09-03 09:56:36 +0000
commit7fb544542262c725b2d5667e02598575788946c5 (patch)
tree94cdc6654a84d9376313d155bdc9914611fd9c72 /devel/py-mercurial
parent87f21b18b62525bc8c0341a0a272dcc6be053bed (diff)
downloadpkgsrc-7fb544542262c725b2d5667e02598575788946c5.tar.gz
Update to 3.1.1:
This is a regularly-scheduled bugfix release. changectx: ancestor should only prefer merge.preferancestor if it is a revision color: pass on key error for win32 (issue4298) config: exit non zero on non-existent config option (issue4247) context: call normal on the right object debugobsolete: catch ValueError that may be raised by obsstore.create discovery: prevent crash on unknown remote heads with old repo (issue4337) graft: fix collision detection with origin revisions that are missing help: add pad function to template help help: only call doc() when it is callable hgweb: avoid config object race with hgwebdir (issue4326) histedit: preserve initial author on fold (issue4296) import: show warning message for merge changesets incoming: don't request heads that already are common largefiles: don't override matchandpats for always matchers (issue4334) largefiles: drop setting lfstatus in overridelog (issue4334) largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) log: use correct phase info for parent field (issue4347) merge: show the scary multiple ancestor hint for merges only, not for updates obsstore.create: add a simple safeguard against cyclic markers repoview: filter tags to non-existent nodes from blockers (issue4328) repoview: fix typo in repoview.changelog revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) unbundle: don't advance bookmarks (issue4322) (BC)
Diffstat (limited to 'devel/py-mercurial')
-rw-r--r--devel/py-mercurial/Makefile.version4
-rw-r--r--devel/py-mercurial/distinfo8
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/py-mercurial/Makefile.version b/devel/py-mercurial/Makefile.version
index 0f1d428a41b..8311ed6debc 100644
--- a/devel/py-mercurial/Makefile.version
+++ b/devel/py-mercurial/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.6 2014/08/02 07:04:18 wiz Exp $
+# $NetBSD: Makefile.version,v 1.7 2014/09/03 09:56:36 wiz Exp $
-VERSION= 3.1
+VERSION= 3.1.1
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 2.9
# see also http://mercurial.selenic.com/wiki/SupportedPythonVersions
diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo
index 39e2f97807d..7e940626d4a 100644
--- a/devel/py-mercurial/distinfo
+++ b/devel/py-mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2014/08/02 07:04:18 wiz Exp $
+$NetBSD: distinfo,v 1.6 2014/09/03 09:56:36 wiz Exp $
-SHA1 (mercurial-3.1.tar.gz) = aa95cd978c347ce7d5334c3280351ce03f861302
-RMD160 (mercurial-3.1.tar.gz) = 891fef5e5c8a58be01f85885a4312137b71c88f4
-Size (mercurial-3.1.tar.gz) = 3963443 bytes
+SHA1 (mercurial-3.1.1.tar.gz) = 09cb417f55175262fcbe510af88db76bb893572e
+RMD160 (mercurial-3.1.1.tar.gz) = 3f567f25f84b366eb15ad0e929dec6a3bf629bb3
+Size (mercurial-3.1.1.tar.gz) = 3982765 bytes