Package: svn-buildpackage
Version: 0.8.0
Severity: important
Tags: patch
When tagging, the BASE revision is tagged which might not be the
current revision of the working directory.
E.g. when checking out r8614 (making BASE=8614) then commiting changes
that become r8615 (BASE is still 8614!!!) then tagging with
svn-buildpackage which does a "-rBASE cp . svn://.." r8614 will be
tagged instead of r8615!
A workaround would be to do a "svn up" to update BASE of the local working dir
before tagging with svn-buildpackage.
To fix the problem, I suggest to remove "-rBASE" from the tagging commands.
Please see the attached patch.
Hope this was helpful,
Tobias
--- System information. ---
Architecture: amd64
Kernel: Linux 2.6.32-trunk-amd64
Debian Release: squeeze/sid
1001 testing www.debian-multimedia.org
1001 testing ftp.de.debian.org
--- Package information. ---
Depends (Version) | Installed
=======================================-+-=============
subversion | 1.6.9dfsg-1
devscripts (>= 2.10.54) | 2.10.64
perl | 5.10.1-12
libsvn-perl | 1.6.9dfsg-1
file | 5.04-2
wget | 1.12-2
unp | 1.0.15
liburi-perl | 1.54-1
libcapture-tiny-perl | 0.07-1
libfile-libmagic-perl | 0.96-1
liblocale-gettext-perl | 1.05-6
Recommends (Version) | Installed
=========================-+-===========
debhelper | 7.4.17
Package's Suggests field is empty.
Index: svn-buildpackage
===================================================================
--- svn-buildpackage (Revision 16090)
+++ svn-buildpackage (Arbeitskopie)
@@ -360,7 +360,7 @@
mychdir $$c{"trunkDir"};
system "$opt_pretag" if($opt_pretag);
my $msg = sprintf (_g("Tagging %s (%s)"), $package, $tagVersion);
- withecho ("svn", "-m", "$scriptname $msg ", "-rBASE", "cp", ".", $$c{"tagsUrl"}."/$tagVersion");
+ withecho ("svn", "-m", "$scriptname $msg ", "cp", ".", $$c{"tagsUrl"}."/$tagVersion");
system "$opt_posttag" if($opt_posttag);
dchIfNeeded;
SDCommon::sd_exit 0;
@@ -813,7 +813,7 @@
# Translators: relates to the use of --svn-tag
printf (_g("Tagging %s (%s)\n"), $package, $tagVersion);
# change from 'withecho' to output the translated string to user only
- withecho ("svn", "-m", "$scriptname Tagging $package $tagVersion ", "-rBASE", "cp", ".", $$c{"tagsUrl"}."/$tagVersion");
+ withecho ("svn", "-m", "$scriptname Tagging $package $tagVersion ", "cp", ".", $$c{"tagsUrl"}."/$tagVersion");
system "$opt_posttag" if($opt_posttag);
dchIfNeeded;
}
