Bug#304462: marked as done (subversion: merge --dry-run with wrong target)

Thu Dec 15 15:03:27 UTC 2005

Your message dated Thu, 15 Dec 2005 08:50:56 -0600
with message-id <20051215145056.GK3033 at p12n.org>
and subject line Bug#304462: subversion: Please close my Bug-Report
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 13 Apr 2005 09:47:41 +0000
>From maletin at mail.berlios.de Wed Apr 13 02:47:41 2005
Return-path: <maletin at mail.berlios.de>
Received: from mail2.ncc.eurodata.de [212.89.134.26] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1DLeTE-0006xe-00; Wed, 13 Apr 2005 02:47:41 -0700
Received: from vscan2.ncc.eurodata.de (vscan2.ncc.eurodata.de [212.89.134.22])
	by mail2.ncc.eurodata.de (Postfix) with ESMTP id 1D6685004F;
	Wed, 13 Apr 2005 11:47:39 +0200 (CEST)
Received: by vscan2.ncc.eurodata.de (Postfix, from userid 8)
	id 1771A9DD08; Wed, 13 Apr 2005 11:47:39 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by vscan2.ncc.eurodata.de (Postfix) with ESMTP id 1CD609DD0A;
	Wed, 13 Apr 2005 11:47:38 +0200 (CEST)
Received: from wn1.edgate.de (mail-redir.eurodata.de [10.2.2.50])
	by mail2.ncc.eurodata.de (Postfix) with ESMTP id 0BDE55004F;
	Wed, 13 Apr 2005 11:47:38 +0200 (CEST)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Martin von Oertzen <maletin at mail.berlios.de>
To: Debian Bug Tracking System <submit at bugs.debian.org>
Subject: subversion: merge --dry-run with wrong target
X-Mailer: reportbug 3.8
Date: Wed, 13 Apr 2005 11:47:37 +0200
Message-Id: <20050413094738.0BDE55004F at mail2.ncc.eurodata.de>
X-Scanned-By: AMaViS-ng (vscan2) at eurodata.
Delivered-To: submit at bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
	autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level: 

Package: subversion
Version: 1.1.4-1
Severity: minor

I get a segmentation fault with "merge --dry-run", if
the svn:keyword property changed, and the target is wrong.

Because the Subversion-Mailing-List can't reproduce this
Bug, I think, it could be a bug at the debian-package.
http://svn.haxx.se/users/archive-2005-04/0752.shtml
http://subversion.tigris.org/issues/show_bug.cgi?id=2254

#!/bin/sh

SVN=/usr/bin/svn
SVNADMIN=/usr/bin/svnadmin

URL=file:///`pwd`/repos

rm -rf repos wc

${SVNADMIN} create repos
${SVN} co ${URL}/ wc

cd wc

${SVN} mkdir trunk
echo "1" > trunk/file.txt
${SVN} add trunk/file.txt
${SVN} ps svn:keywords 'id' trunk/file.txt
${SVN} ci -m ''
${SVN} pd svn:keywords trunk/file.txt
${SVN} mkdir branches
${SVN} ci -m ''

cd branches/

echo ""
echo "In directory wc/branches, about to run 'svn merge --dry-run -r1:2 ..
..':"
echo ""

${SVN} merge --dry-run -r1:2 .. .

This script above produces the following output at two
debian-systems with subversion 1.1.4-1 and 1.1.3-3:

Checked out revision 0.
A         trunk
A         trunk/file.txt
property 'svn:keywords' set on 'trunk/file.txt'
Adding         trunk
Adding         trunk/file.txt
Transmitting file data .
Committed revision 1.
property 'svn:keywords' deleted from 'trunk/file.txt'.
A         branches
Adding         branches
Sending        trunk/file.txt

Committed revision 2.

In directory wc/branches, about to run 'svn merge --dry-run -r1:2 ..  .':

/home/moertzen/bug.sh: line 30: 30171 Segmentation fault      ${SVN} merge
--dry-run -r1:2 .. .

Regards, Martin.

-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (400, 'testing'), (300, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.4.20
Locale: LANG=de_DE at euro, LC_CTYPE=de_DE at euro (charmap=ISO-8859-15)

Versions of packages subversion depends on:
ii  db4.2-util                 4.2.52-18     Berkeley v4.2 Database Utilities
ii  libapr0                    2.0.53-5      the Apache Portable Runtime
ii  libc6                      2.3.2.ds1-20  GNU C Library: Shared libraries an
ii  libdb4.2                   4.2.52-18     Berkeley v4.2 Database Libraries [
ii  libexpat1                  1.95.8-1      XML parsing C library - runtime li
ii  libldap2                   2.1.30-3      OpenLDAP libraries
ii  libneon24                  0.24.7.dfsg-1 An HTTP and WebDAV client library
ii  libssl0.9.7                0.9.7e-3      SSL shared libraries
ii  libsvn0                    1.1.4-1       shared libraries used by Subversio
ii  libxml2                    2.6.16-6      GNOME XML library
ii  patch                      2.5.9-2       Apply a diff file to an original
ii  zlib1g                     1:1.2.2-3     compression library - runtime

-- no debconf information

---------------------------------------
Received: (at 304462-done) by bugs.debian.org; 15 Dec 2005 14:51:29 +0000
>From ps at p12n.org Thu Dec 15 06:51:29 2005
Return-path: <ps at p12n.org>
Received: from smtp109.sbc.mail.mud.yahoo.com ([68.142.198.208])
	by spohr.debian.org with smtp (Exim 4.50)
	id 1EmuS9-0006JC-5T
	for 304462-done at bugs.debian.org; Thu, 15 Dec 2005 06:51:29 -0800
Received: (qmail 62983 invoked from network); 15 Dec 2005 14:50:57 -0000
Received: from unknown (HELO wire.p12n.org) (ps.2 at sbcglobal.net@67.64.25.67 with login)
  by smtp109.sbc.mail.mud.yahoo.com with SMTP; 15 Dec 2005 14:50:57 -0000
Received: by wire.p12n.org (Postfix, from userid 1001)
	id 0401D456491; Thu, 15 Dec 2005 08:50:57 -0600 (CST)
Date: Thu, 15 Dec 2005 08:50:56 -0600
From: Peter Samuelson <peter at p12n.org>
To: 304462-done at bugs.debian.org
Subject: Re: Bug#304462: subversion: Please close my Bug-Report
Message-ID: <20051215145056.GK3033 at p12n.org>
References: <20051215140957.21011.42764.reportbug at localhost.localdomain>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="i2jtRfQnnEqHm4mE"
Content-Disposition: inline
In-Reply-To: <20051215140957.21011.42764.reportbug at localhost.localdomain>
User-Agent: Mutt/1.5.11
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level: 
X-Spam-Status: No, hits=-5.5 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER,
	RCVD_IN_SORBS autolearn=no version=2.60-bugs.debian.org_2005_01_02

--i2jtRfQnnEqHm4mE
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Version: 1.2.3dfsg1-2

[Martin von Oertzen]
> As Karl Fogel wrote, my report belongs to a misunderstanding.

Probably not a misunderstanding, just a normal bug fix from upstream.

> I tried my reproduction script today with version 1.2.3dfsg1-2 and I
> received a normal error message without a segmentation fault:

Good to hear it.  Closing the bug now.

Thanks,
Peter

--i2jtRfQnnEqHm4mE
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDoYLQXk7sIRPQRh0RAvX3AJ4st4P63nxQmJBtpgdweMjhQFrshgCfcCrn
VKMQI/x7BWLixIkAx4sJGgI=
=poKZ
-----END PGP SIGNATURE-----

--i2jtRfQnnEqHm4mE--