The following commit has been merged in the master branch:
commit 75ec72108713729dd72ee769380c6672b2f3d5e9
Author: Benjamin Drung <[email protected]>
Date: Fri Mar 30 15:29:55 2012 +0200
debcommit: Subversion 1.7 has only one .svn folder per working copy.
Thanks: Simon Olofsson
Closes: #645106
diff --git a/debian/changelog b/debian/changelog
index b9373c4..063846a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ devscripts (2.11.6) UNRELEASED; urgency=low
* cowpoke.1, deb-reversion.dbk, dscextract.1: Fix typos "occured",
"transfered", and "addtional". Thanks to A. Costa for the patches.
(Closes: #655681)
+ * debcommit: Subversion 1.7 has only one .svn folder per working copy.
+ Thanks to Simon Olofsson for the patch. (Closes: #645106)
- -- Benjamin Drung <[email protected]> Fri, 30 Mar 2012 15:08:27 +0200
+ -- Benjamin Drung <[email protected]> Fri, 30 Mar 2012 15:27:53 +0200
devscripts (2.11.5) unstable; urgency=low
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index 815b786..36dae5c 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -452,7 +452,7 @@ sub getprog {
}
}
- # .bzr or .git may be in a parent directory, rather than the current
+ # .bzr, .git, or .svn may be in a parent directory, rather than the current
# directory, if multiple packages are kept in one repository.
my $dir=getcwd();
while ($dir=~s/[^\/]*\/?$// && length $dir) {
@@ -462,6 +462,9 @@ sub getprog {
if (-d "$dir/.git") {
return "git";
}
+ if (-d "$dir/.svn") {
+ return "svn";
+ }
}
die "debcommit: not in a cvs, subversion, baz, bzr, git, hg, svk or darcs
working copy\n";
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
