Bug#363003: Bug#422342: Small fix?

[Jan Hauke Rahm]

On Thu, Dec 04, 2008 at 11:45:04AM +0200, Eddy Petrișor wrote:
> 2008/12/1 Jan Hauke Rahm <[EMAIL PROTECTED]>:
> > Index: SDCommon.pm
> > ===================================================================
> > --- SDCommon.pm (revision 11906)
> > +++ SDCommon.pm (working copy)
> > @@ -487,7 +487,7 @@
> >
> >  sub check_uncommited {
> >    my  @conflicts;
> > -   open(SVN, "env LC_ALL=C svn status |") or die ("Can't open `svn 
> > status`: $!");
> > +   open(SVN, "env LC_ALL=C svn status --svn-ignore |") or die ("Can't open 
> > `svn status`: $!");
> 
> you probably meant --ignore-externals instead of --svn-ignore
> 
> >    for(<SVN>) {
> >        if(/^\s*M+\s+(.*)/) {
> >            # FIXME: rewrite to run svn propget in one command with a list if

Of course!

I tried to fix 363003 (which is CC'd) and I think we can get those in
one shot. My attempt seems to solve both bugs by not letting svn-bp
abort on "unresolved issues" that are actually just svn:externals that
need to be imported. svn export considers externals so that building
wouldn't fail.
I tried the shell script of Pekka Pessi in [1] and it seems to run
properly with my patch.
I wrote another line and attached the ne patch. So? :)

Hauke

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=363003#25

Index: debian/changelog
===================================================================
--- debian/changelog	(revision 11968)
+++ debian/changelog	(working copy)
@@ -33,6 +33,8 @@
   * SDCommon.pm: Trigger a warning when files are ignored by subversion
     (Closes: #504233)
   * Dropping support for linda (Closes: #502653)
+  * Let svn-buildpackage not complain about unresolved issues when it's just
+    about svn:externals (Closes: #363003, #422342)
 
   [ Eddy Petrișor ]
   * Added a helper script to ease up installation of the build-deps of
@@ -48,7 +50,7 @@
     way Gonéri proposed was broken in several ways (and I copied that
     without checking) correctly closes: #419005 instead of hiding it
 
- -- Eddy Petrișor <[EMAIL PROTECTED]>  Sat, 06 Dec 2008 18:05:16 +0200
+ -- Jan Hauke Rahm <[EMAIL PROTECTED]>  Sun, 07 Dec 2008 17:13:26 +0100
 
 svn-buildpackage (0.6.23) unstable; urgency=high
 
Index: SDCommon.pm
===================================================================
--- SDCommon.pm	(revision 11968)
+++ SDCommon.pm	(working copy)
@@ -488,8 +488,10 @@
 
 sub check_uncommited {
    my  @conflicts;
-   open(SVN, "env LC_ALL=C svn status |") or die ("Can't open `svn status`: $!");
+   open(SVN, "env LC_ALL=C svn status --ignore-externals |") or die ("Can't open `svn status`: $!");
    for(<SVN>) {
+       next if /^\s*$/;
+       next if /^\s*X+\s+(.*)/;
        if(/^\s*M+\s+(.*)/) {
            # FIXME: rewrite to run svn propget in one command with a list if
            # somebody complains about performance issues

signature.asc
Description: Digital signature