Package: git-svn
Severity: normal
Tags: patch
Hi,
when converiting the package seqan from svn to git I endet up with
...
M debian/razers.1
M debian/seqcons.1
M debian/control
r4104 = 27169ee914cccd3de00d94c1bfbd7d880a12897e (refs/remotes/svn-import/trunk)
Found possible branch point:
svn://svn.debian.org/svn/debian-med/trunk/packages/seqan/trunk =
svn://svn.debian.org/svn/debian-med/trunk/packages/seqan/tags/1.2-1, 4105
Use of uninitialized value $u in substitution (s///) at
/usr/share/perl5/Git/SVN.pm line 106.
Use of uninitialized value $u in concatenation (.) or string at
/usr/share/perl5/Git/SVN.pm line 106.
refs/remotes/svn-import/tags/1.2-1: 'svn://svn.debian.org/svn/debian-med' not
found in ''
After some web search I found that this is a known bug that as far as
I could find is not yet fixed upsteam. I found a patch at
https://groups.google.com/forum/#!topic/msysgit/7MQVwRO-2N4
and applied this to the latest version in experimental. It worked
for me so far.
Kind regards and thanks for maintaining git
Andreas.
PS: Inventing your own patch system competing with quilt is a bit unusual.
-- System Information:
Debian Release: 8.1
APT prefers stable
APT policy: (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Author: Andreas Tille ti...@debian.org
Date: Thu, 09 Jul 2015 11:07:59 +0200
Subject: Apply the solution for a known problem suggested at
https://groups.google.com/forum/#!topic/msysgit/7MQVwRO-2N4
This worked for me on the transition from seqan
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -98,8 +98,12 @@ sub resolve_local_globs {
globbed: $refname\n;
}
my $u = (::cmt_metadata($refname))[0];
- $u =~ s!^\Q$url\E(/|$)!! or die
- $refname: '$url' not found in '$u'\n;
+ if (!$u) {
+$u = $pathname;
+ } else {
+$u =~ s!^\Q$url\E(/|$)!! or die
+ $refname: '$url' not found in '$u'\n;
+ }
if ($pathname ne $u) {
warn W: Refspec glob conflict ,
(ref: $refname):\n,