found 414547 0.6.16 notfound 414547 0.6.16.1 tag 414547 patch thanks # 0.6.16.1 is not released yet
Hi,
This issue appends when mergeWithUpstream is not used.
I propose this patch. I did it against the 0.6.16.1 branch [1]:
--- svn-buildpackage (révision 2567)
+++ svn-buildpackage (copie de travail)
@@ -361,10 +361,17 @@
set_statusref(\%tmp);
my $ctx = new SVN::Client;
$ctx->status("", "BASE", \&SDCommon::collect_name, 1, 1, 0, 1);
-
+# look for uncommited file (see #414547)
+my %notonsvnentry;
+foreach (`svn status`) {
+ if (/^\?\s+(.+)$/) {
+ $notonsvnentry{$1} = 1;
+ }
+}
for(keys %tmp) {
s#/$##;
next if !length($_);
+ next if defined ($notonsvnentry{$_});
if(-d $_ and not -l $_ ) {
push(@dirs,$_);
print STDERR "DIR: $_\n" if $opt_verbose;
[1]http://svn.debian.org/wsvn/collab-maint/deb-maint/svn-buildpackage/branches/0.6.16.1/?rev=0&sc=0
Best regards,
Gonéri
pgpcKd1wkScUm.pgp
Description: PGP signature
