subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bert Huijben" <b...@qqmail.nl>
Subject RE: crash when merging
Date Tue, 04 Jun 2013 08:56:54 GMT


> -----Original Message-----
> From: Julian Foad [mailto:julianfoad@btopenworld.com]
> Sent: dinsdag 4 juni 2013 00:13
> To: Stefan Küng
> Cc: Subversion Development
> Subject: Re: crash when merging
> 
> I (Julian Foad) wrote:
> 
> > Stefan Küng <tortoisesvn@gmail.com> wrote:
> >>  SVN_ERR_W(svn_cl__check_related_source_and_target(
> >>            sourcepath1, &peg_revision1,
> >>            targetpath, &unspecified_revision, ctx, scratch_pool),
> >>      _("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.  Confirmed.  We need a check just before reaching line
> 12345
> > (yes, really) of merge.c.
> 
> (Oops, that pretty line number was in a locally modified version of
> merge.c.  It's line 12311 in the current head version.)

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

	Bert


Mime
View raw message