Date: Wed, 13 Apr 2011 16:58:16 GMT From: David Naylor <naylor.b.david@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/156373: [patch] devel/svn2git: update from 1.0.3 to 1.0.4 Message-ID: <201104131658.p3DGwGs0001659@red.freebsd.org> Resent-Message-ID: <201104131700.p3DH0PGr047760@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156373
>Category: ports
>Synopsis: [patch] devel/svn2git: update from 1.0.3 to 1.0.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 13 17:00:25 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: David Naylor
>Release: FreeBSD-current
>Organization:
Private
>Environment:
>Description:
commit 9677b1fea3ab82db3e9185439938d9e2380e02d4
Author: Sebastian Pipping <sebastian@pipping.org>
Date: Fri Apr 8 07:16:44 2011 +0200
Save deleted branches in a visible namespace
- The branch is first created properly and then deleted
(line "progress SVN r77 branch config-header = :0 # delete")
- Jehan's post-1.0.3 commit 584005f2e26149282aa12c4a0367d250caaf3918
writes a backup of the branches latest ref to refs/backup/
on deletion. Many thanks for that commit!
However, in my opinion the problem with the current code is that it
makes it much too easy to lose history during the conversion to Git.
Without a tag or branch pointing to it the commits will fall off easily,
especially if people use "git clone" on the bare Git repository created
by svn2git.
It would be safer and useful to create visible tags for this, e.g.
refs/tags/branch-bugfix17-deleted.
My attached patch changes Jehan's code to do just that.
Please consider application - this patch really matters to me.
If you'd rather have both a ref in refs/backup/ and in refs/tags/ or
require a command line option for it I can adjust the patch for you.
Thanks for listening,
commit 584005f2e26149282aa12c4a0367d250caaf3918
Author: Jehan Bing <nahor.j@gmail.com>
Date: Thu Mar 10 10:54:52 2011 -0800
Create backup reference before deletion of the original branch
Ensure that the backup reference is created before deleting the original
branch. As it was, the deletion was executed earlier causing the backup
reference to point to a non-existing branch so was not created.
commit 34f881571e48b6fb71f687944ff4420d589a6d22
Author: Nicol<C3><A1>s Alvarez <nicolas.alvarez@gmail.com>
Date: Wed Mar 16 17:37:22 2011 -0300
Remove unnecessary const casts.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ur /usr/ports/devel/svn2git/Makefile svn2git/Makefile
--- /usr/ports/devel/svn2git/Makefile 2011-04-05 22:06:18.000000000 +0200
+++ svn2git/Makefile 2011-04-13 18:31:13.000000000 +0200
@@ -5,7 +5,7 @@
# $FreeBSD: ports/devel/svn2git/Makefile,v 1.1 2011/04/05 20:06:18 makc Exp $
PORTNAME= svn2git
-DISTVERSION= 1.0.3
+DISTVERSION= 1.0.4
CATEGORIES= devel kde
MASTER_SITES= http://cloud.github.com/downloads/DragonSA/svn2git/
diff -ur /usr/ports/devel/svn2git/distinfo svn2git/distinfo
--- /usr/ports/devel/svn2git/distinfo 2011-04-05 22:06:18.000000000 +0200
+++ svn2git/distinfo 2011-04-13 18:50:24.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (svn2git-1.0.3.tar.xz) = 4dc207f457ff38f2f762f5b15f4ef3c1f3652ffa61769fede853eeed816ace68
-SIZE (svn2git-1.0.3.tar.xz) = 21736
+SHA256 (svn2git-1.0.4.tar.xz) = 520dcb406f7b18fe09558a8c633ab5819c9a3a60140f5f04e86414e06ac0e9a9
+SIZE (svn2git-1.0.4.tar.xz) = 21800
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104131658.p3DGwGs0001659>