From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 28 18:40:09 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51FE31065670 for ; Sat, 28 Jan 2012 18:40:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 297928FC1E for ; Sat, 28 Jan 2012 18:40:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q0SIe94Q086597 for ; Sat, 28 Jan 2012 18:40:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0SIe9On086595; Sat, 28 Jan 2012 18:40:09 GMT (envelope-from gnats) Resent-Date: Sat, 28 Jan 2012 18:40:09 GMT Resent-Message-Id: <201201281840.q0SIe9On086595@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marco Bröder Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 437DA106564A for ; Sat, 28 Jan 2012 18:34:49 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 224A28FC1C for ; Sat, 28 Jan 2012 18:34:49 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q0SIYmmZ091381 for ; Sat, 28 Jan 2012 18:34:48 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q0SIYmOh091380; Sat, 28 Jan 2012 18:34:48 GMT (envelope-from nobody) Message-Id: <201201281834.q0SIYmOh091380@red.freebsd.org> Date: Sat, 28 Jan 2012 18:34:48 GMT From: Marco Bröder To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/164584: [maintainer-update] [patch] devel/hg-git: Update to 0.3.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2012 18:40:09 -0000 >Number: 164584 >Category: ports >Synopsis: [maintainer-update] [patch] devel/hg-git: Update to 0.3.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jan 28 18:40:08 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Marco Bröder >Release: stable/9 amd64 >Organization: >Environment: >Description: Update to 0.3.2 release. Adjust required dependencies versions. Update pkg-descr and pkg-message text. Tested: portlint, tinderbox build, pkg_add / pkg_delete, runtime Thanks! >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile index 9e14fd6..f989886 100644 --- a/devel/hg-git/Makefile +++ b/devel/hg-git/Makefile @@ -6,7 +6,7 @@ # PORTNAME= hg-git -PORTVERSION= 0.3.1 +PORTVERSION= 0.3.2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,8 +16,8 @@ COMMENT= Mercurial extension to pull from or push to a Git repository LICENSE= GPLv2 -RUN_DEPENDS= ${PKGNAMEPREFIX}dulwich>=0.8.0:${PORTSDIR}/devel/dulwich \ - mercurial>=1.9.0:${PORTSDIR}/devel/mercurial +RUN_DEPENDS= ${PKGNAMEPREFIX}dulwich>=0.8.3:${PORTSDIR}/devel/dulwich \ + mercurial>=2.0.2:${PORTSDIR}/devel/mercurial MAKE_JOBS_SAFE= yes diff --git a/devel/hg-git/distinfo b/devel/hg-git/distinfo index 550b803..6af66f6 100644 --- a/devel/hg-git/distinfo +++ b/devel/hg-git/distinfo @@ -1,2 +1,2 @@ -SHA256 (hg-git-0.3.1.tar.gz) = c877a407a55d65f634410bb9b567b7565310d3005fb1256484bde156bf30ab0e -SIZE (hg-git-0.3.1.tar.gz) = 16361 +SHA256 (hg-git-0.3.2.tar.gz) = fc5517e4af09478835d97e3c3b37cc95b9783ff5b585ef893f891057f8b52f43 +SIZE (hg-git-0.3.2.tar.gz) = 16546 diff --git a/devel/hg-git/pkg-descr b/devel/hg-git/pkg-descr index 390de85..888a42b 100644 --- a/devel/hg-git/pkg-descr +++ b/devel/hg-git/pkg-descr @@ -5,18 +5,17 @@ collaboration point for a team with developers using both Git and Mercurial. The Hg-Git plugin can convert commits / changesets losslessly from one system to another, so you can push via a Mercurial repository and another Mercurial -client can pull it and their changeset node ids will be identical - Mercurial -data does not get lost in translation. +client can pull it. In theory, the changeset IDs should not change, although +this may not hold true for complex histories. This plugin is implemented entirely in Python - there are no Git binary dependencies, you do not need to have Git installed on your system. *** WARNING: Do not use this software in data critical production environments, -only in safe test environments! This software is still BETA! +only in safe test environments! This software is still BETA! *** -It is basically feature complete and pretty stable now, but there could be -still some edge cases. The user interface could also still be changed. However, -there are now a lot of people using it effectively, so please test it yourself -and report encountered bugs upstream (see website). Thanks! *** +The plugin is basically functional and usable now, but there are still some +edge cases. However, there are several people using it effectively, so please +test it yourself and report encountered bugs upstream (see website). Thanks! WWW: http://hg-git.github.com/ diff --git a/devel/hg-git/pkg-message b/devel/hg-git/pkg-message index 72cba35..4939963 100644 --- a/devel/hg-git/pkg-message +++ b/devel/hg-git/pkg-message @@ -7,10 +7,9 @@ To enable the Hg-Git extension make sure you have the following lines in your Mercurial global configuration file '~/.hgrc': [extensions] -bookmarks = hggit = -The bookmarks section is only required prior to hg 1.7. Bookmarks will be -translated to git heads when pushing. +Note: As of Mercurial 1.8 the required bookmarks extension became a core +functionality and can be removed from the extensions list. ==== >Release-Note: >Audit-Trail: >Unformatted: