Mercurial > oi > oi-build
changeset 400:675bae2e4833
7060246 Update Mercurial to 1.8.4
| author | Danek Duvall <danek.duvall@oracle.com> |
|---|---|
| date | Thu, 14 Jul 2011 10:55:47 -0700 |
| parents | d877cc559d95 |
| children | bf52ef48020c |
| files | components/mercurial/Makefile components/mercurial/patches/https_proxy.patch components/mercurial/patches/manpages.patch |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/components/mercurial/Makefile Thu Jul 14 07:46:25 2011 -0700 +++ b/components/mercurial/Makefile Thu Jul 14 10:55:47 2011 -0700 @@ -25,10 +25,10 @@ PATH=/usr/bin:/usr/gnu/bin:/usr/sbin COMPONENT_NAME= mercurial -COMPONENT_VERSION= 1.8.2 +COMPONENT_VERSION= 1.8.4 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha1:394e95b3ddfb9b725368b81ad60dc39382fb9e12 +COMPONENT_ARCHIVE_HASH= sha1:25c4f9b1ad1c5c8ef94ca5b120c9af6bdfd23bdc COMPONENT_ARCHIVE_URL= http://www.selenic.com/mercurial/release/$(COMPONENT_ARCHIVE) include $(WS_TOP)/make-rules/prep.mk
--- a/components/mercurial/patches/https_proxy.patch Thu Jul 14 07:46:25 2011 -0700 +++ b/components/mercurial/patches/https_proxy.patch Thu Jul 14 10:55:47 2011 -0700 @@ -1,6 +1,6 @@ # 7029500 Mercurial doesn't work through https in snv_161 ---- mercurial-1.8.2/mercurial/keepalive.py.orig Fri Apr 1 17:41:52 2011 +--- mercurial-1.8.2/mercurial/keepalive.py.orig Wed Jun 1 21:32:43 2011 +++ mercurial-1.8.2/mercurial/keepalive.py Fri Apr 1 11:07:32 2011 @@ -249,6 +249,8 @@ else:
--- a/components/mercurial/patches/manpages.patch Thu Jul 14 07:46:25 2011 -0700 +++ b/components/mercurial/patches/manpages.patch Thu Jul 14 10:55:47 2011 -0700 @@ -4611,7 +4611,7 @@ [extensions] -# (the mq extension will get loaded from Mercurial\(aqs path) +# (the mq extension will get loaded from Mercurial's path) - hgext.mq = + mq = # (this extension will get loaded from the file specified) myfeature = ~/.hgext/myfeature.py -.ft P