Attachment 121571 Details for Bug 164584 – file.diff

[patch] file.diff

file.diff (text/plain), 3.21 KB, created by Marco Bröder on 2012-01-28 18:40:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Bröder

Created: 2012-01-28 18:40:08 UTC

Size: 3.21 KB

patch

obsolete

>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.
> 
> ====

Actions: View | Diff

Attachments on bug 164584: 121571