crash when merging in 1.8.1

2013-07-29 Thread Stefan Küng
Hi, a crash happens when merging in 1.8.1 with the following stack trace: libsvn_tsvn.dll!filter_log_entry_with_rangelist(void * baton=0x005513aabf38, svn_log_entry_t * log_entry=0x005513a919b8, apr_pool_t * pool=0x8080808080808080) Line 1400C libsvn_tsvn.dll!log_closed(svn_ra

RE: crash when merging

2013-06-04 Thread Bert Huijben
> -Original Message- > From: Julian Foad [mailto:julianf...@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: > > > St

Re: crash when merging

2013-06-03 Thread Julian Foad
I (Julian Foad) wrote: > I (Julian Foad) wrote: >> Stefan Küng wrote: > This is the patch needed, modeled on the existing 'reintegrate' code > (that's where the slightly strange error code comes from): > > [[[ > Index: subversion/libsvn_client/merge.c >

Re: crash when merging

2013-06-03 Thread Julian Foad
I (Julian Foad) wrote: > Stefan Küng 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 rep

Re: crash when merging

2013-06-03 Thread Julian Foad
Stefan Küng wrote: > I've got a small problem. As reported on the TSVN mailing list here: > http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3057019 > > an automatic merge can crash. > > The command line client does not, because it first checks the relationship of > th

crash when merging

2013-06-03 Thread Stefan Küng
Hi, I've got a small problem. As reported on the TSVN mailing list here: http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3057019 an automatic merge can crash. The command line client does not, because it first checks the relationship of the urls: merge-cmd.c, line 10

Re: Crash when merging

2011-11-16 Thread Paul Burba
On Wed, Nov 16, 2011 at 12:57 PM, Stefan Küng wrote: > On 16.11.2011 18:56, Paul Burba wrote: >> >> On Wed, Nov 16, 2011 at 12:24 PM, Stefan Küng >>  wrote: >>> >>> Hi, >>> >>> A few crash reports for TSVN show a problem in libsvn_client\merge.c, >>> function merge_props_changed: >>> >>> if (strcm

Re: Crash when merging

2011-11-16 Thread Stefan Küng
On 16.11.2011 18:56, Paul Burba wrote: On Wed, Nov 16, 2011 at 12:24 PM, Stefan Küng wrote: Hi, A few crash reports for TSVN show a problem in libsvn_client\merge.c, function merge_props_changed: if (strcmp(prop->name, SVN_PROP_MERGEINFO) == 0) { /* Does LOCAL_ABSPATH have any pristine merg

Re: Crash when merging

2011-11-16 Thread Paul Burba
On Wed, Nov 16, 2011 at 12:24 PM, Stefan Küng wrote: > Hi, > > A few crash reports for TSVN show a problem in libsvn_client\merge.c, > function merge_props_changed: > > if (strcmp(prop->name, SVN_PROP_MERGEINFO) == 0) > { >  /* Does LOCAL_ABSPATH have any pristine mergeinfo? */ >  svn_boolean_t ha

Crash when merging

2011-11-16 Thread Stefan Küng
Hi, A few crash reports for TSVN show a problem in libsvn_client\merge.c, function merge_props_changed: if (strcmp(prop->name, SVN_PROP_MERGEINFO) == 0) { /* Does LOCAL_ABSPATH have any pristine mergeinfo? */ svn_boolean_t has_pristine_mergeinfo = FALSE; apr_hash_t *pristine_props; SV