summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorwiz <wiz>2012-04-07 15:08:21 +0000
committerwiz <wiz>2012-04-07 15:08:21 +0000
commite24ba2ccc21caedb83cca8fd243e78b9545d58aa (patch)
tree7f30cc15f6dcf01e784fefe86ff33e73902da3da /devel
parent465087e906e42bd0c6bafcbf045aba5b2f05cbc7 (diff)
downloadpkgsrc-e24ba2ccc21caedb83cca8fd243e78b9545d58aa.tar.gz
Update to 2.1.2:
This is a regularly-scheduled bugfix release. alias: abort on missing positional args (issue3331) aliases: use empty string for missing position parameters (issue3331) bookmarks: clone non-divergent bookmarks with @ in them convert/git: abort if git submodules are detected (issue2150) convert: deal with empty splicemap path (issue3311) dirstate: avoid normalizing letter case on icasefs for exact match (issue3340) dirstate: fix some problems for recursive case normalization (issue3342) dirstate: normalize case of directory components extdiff: escape filenames with vim/DirDiff and make quoting work with Windows filemerge: remove temporary files when using internal:dump as merge-tool filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 icasefs: use case preserved root for 'util.fspath()' invocation (issue3302) largefiles: suppress unexpected warning of 'hg status' for removed files localrepo: fix unpushable repos when using bookmarks (issue3317) merge: accept missing revisions in symlink flag merge (issue3316) merge: handle linear update to symlink correctly (issue3316) mq: fix qpush --move with comments in series file between applied patches qfinish: comply with the phases.new-commit option in secret mode (issue3335) rebase: move bookmarks as needed with pull --rebase (issue3285) rebase: properly calculate descendant set when aborting (issue3332) rename: handle case-changing (issue1717) setup.py: don't call splitlines twice on the output of xcodebuild (issue3277) strip: enhance repair.strip to receive a list of nodes (issue3299) strip: ignore -n (issue3326) (BC) wix: add phases help text and two more translations (issue3288)
Diffstat (limited to 'devel')
-rw-r--r--devel/mercurial/Makefile5
-rw-r--r--devel/mercurial/distinfo9
2 files changed, 6 insertions, 8 deletions
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index dc9828f1170..453ab320b77 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2012/03/15 11:53:24 obache Exp $
+# $NetBSD: Makefile,v 1.70 2012/04/07 15:08:21 wiz Exp $
#
-DISTNAME= mercurial-2.1.1
-PKGREVISION= 1
+DISTNAME= mercurial-2.1.2
CATEGORIES= devel scm
MASTER_SITES= http://mercurial.selenic.com/release/
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 617ebd00749..8d61bef43f5 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.56 2012/03/15 19:43:06 adam Exp $
+$NetBSD: distinfo,v 1.57 2012/04/07 15:08:21 wiz Exp $
-SHA1 (mercurial-2.1.1.tar.gz) = d6cc4b649b6705113732e62756788542897ba008
-RMD160 (mercurial-2.1.1.tar.gz) = e17a995a069d1a7a46537a49189520df953acb6f
-Size (mercurial-2.1.1.tar.gz) = 3313261 bytes
-SHA1 (patch-setup.py) = cb22596142587a60c61fa7a9a4c60a7a388d0e54
+SHA1 (mercurial-2.1.2.tar.gz) = 6fa2f2510757e3e62efa9d8953f8b703b84075b2
+RMD160 (mercurial-2.1.2.tar.gz) = 4ac9a91e7debbe556f1c314cc3b6fc87b6cbf2f0
+Size (mercurial-2.1.2.tar.gz) = 3343349 bytes