> -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
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
>
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
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
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
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
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
7 matches
Mail list logo
