Return-Path: 
 <dev-return-26594-apmail-subversion-dev-archive=subversion.apache.org@subversion.apache.org>
X-Original-To: apmail-subversion-dev-archive@minotaur.apache.org
Delivered-To: apmail-subversion-dev-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id ADD51CD0F
	for <apmail-subversion-dev-archive@minotaur.apache.org>;
 Tue,  4 Jun 2013 08:57:57 +0000 (UTC)
Received: (qmail 6945 invoked by uid 500); 4 Jun 2013 08:57:57 -0000
Delivered-To: apmail-subversion-dev-archive@subversion.apache.org
Received: (qmail 6908 invoked by uid 500); 4 Jun 2013 08:57:57 -0000
Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@subversion.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@subversion.apache.org>
List-Post: <mailto:dev@subversion.apache.org>
List-Id: <dev.subversion.apache.org>
Delivered-To: mailing list dev@subversion.apache.org
Received: (qmail 6901 invoked by uid 99); 4 Jun 2013 08:57:56 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 08:57:56 +0000
X-ASF-Spam-Status: No, hits=-0.7 required=5.0
	tests=RCVD_IN_DNSWL_LOW
X-Spam-Check-By: apache.org
Received-SPF: error (nike.apache.org: local policy)
Received: from [74.125.82.51] (HELO mail-wg0-f51.google.com) (74.125.82.51)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 08:57:50 +0000
Received: by mail-wg0-f51.google.com with SMTP id b13so4013429wgh.18
        for <dev@subversion.apache.org>; Tue, 04 Jun 2013 01:57:08 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=google.com; s=20120113;
        h=from:to:cc:references:in-reply-to:subject:date:message-id
         :mime-version:content-type:content-transfer-encoding:x-mailer
         :thread-index:content-language:x-gm-message-state;
        bh=AQm0WB4iDsjQ6hX0Lj5MDdySOE2gIMIlPkneRRKNLQE=;
        b=DEzfeZ+/JL5AdFLJQ/BWpG9IBYWenWtkNPglj5dvXcNbttSox1ov4iG+1TTfloImTb
         cL/duYVJNtK8ClVhL4h7/4Y5zOC/VMOwHJDHpnoSSPNIxXK+6GuW1+5ZK5scYUJovI0j
         GalS+1Q/g/1tDS8tf22B32XPAOkXPSzXxCzbxSL9iKquYTfJB4CONiaGELyIISV3SC43
         Yun9Ir75+QgHYSkHI6j3xsIhZw4YLbPg83vrMnsSovhdS9lvQLgr6kmXhXAvF3RLIFtB
         VnfLANey++ptEUbGjfDw4ZEQ75x8C0z3sKoBfgA28SkQZtLXxyt0GHF6fWREKzCMzliv
         3W1Q==
X-Received: by 10.180.87.162 with SMTP id az2mr452048wib.10.1370336228598;
        Tue, 04 Jun 2013 01:57:08 -0700 (PDT)
Received: from i72600 ([2001:610:66e:0:59f6:6194:a164:dbd7])
        by mx.google.com with ESMTPSA id q20sm1264314wiv.7.2013.06.04.01.57.04
        for <multiple recipients>
        (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
        Tue, 04 Jun 2013 01:57:07 -0700 (PDT)
From: "Bert Huijben" <bert@qqmail.nl>
To: "'Julian Foad'" <julianfoad@btopenworld.com>,
	=?iso-8859-1?Q?'Stefan_K=FCng'?= <tortoisesvn@gmail.com>
Cc: "'Subversion Development'" <dev@subversion.apache.org>
References: <51ACDCC3.8040207@gmail.com>
 <1370290746.93594.YahooMailNeo@web186104.mail.ir2.yahoo.com>
 <1370297573.69497.YahooMailNeo@web186104.mail.ir2.yahoo.com>
In-Reply-To: <1370297573.69497.YahooMailNeo@web186104.mail.ir2.yahoo.com>
Subject: RE: crash when merging
Date: Tue, 4 Jun 2013 10:56:54 +0200
Message-ID: <05d801ce6101$79ea68b0$6dbf3a10$@qqmail.nl>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
X-Mailer: Microsoft Outlook 15.0
Thread-Index: AQGTRXdq26i1oOn4laVELYACjqp2HwDcXEDDAr9nQ5+Zfpm6gA==
Content-Language: nl
X-Gm-Message-State: 
 ALoCoQnRHWBSSbu/IEJYPMWmEGcsIyNWHoxwzefKY7wWvTfPEakNK+ZbKiRbx+3QqH+notPZC6kJ
X-Virus-Checked: Checked by ClamAV on apache.org



> -----Original Message-----
> From: Julian Foad [mailto:julianfoad@btopenworld.com]
> Sent: dinsdag 4 juni 2013 00:13
> To: Stefan K=FCng
> Cc: Subversion Development
> Subject: Re: crash when merging
>=20
> I (Julian Foad) wrote:
>=20
> > Stefan K=FCng <tortoisesvn@gmail.com> wrote:
> >>  SVN_ERR_W(svn_cl__check_related_source_and_target(
> >>  =A0=A0=A0 =A0=A0=A0 =A0 sourcepath1, &peg_revision1,
> >>  =A0=A0=A0 =A0=A0=A0 =A0 targetpath, &unspecified_revision, ctx, =
scratch_pool),
> >>  =A0=A0=A0 _("Source and target must be different but related =
branches"));
> >>
> >>  To reproduce the crash with the CL client, simply remove that =
check
and
> do
> >> the merge.
> >
> > Thanks, Stefan.=A0 Confirmed.=A0 We need a check just before =
reaching line
> 12345
> > (yes, really) of merge.c.
>=20
> (Oops, that pretty line number was in a locally modified version of
> merge.c.=A0 It's line 12311 in the current head version.)

I knew there has to be such a reason for that line number ;-)

	Bert