[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

crash when merging

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 03 Jun 2013 20:13:23 +0200

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 109ff:
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.

Now what should I do in TSVN? That check API is internal, so it's not
available for TSVN. How can I reject the merge before calling
svn_client_merge_peg5 to avoid the crash?

And why is that check not done in svn_client_merge_peg5 if it's required
to do so?

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
Received on 2013-06-03 20:14:00 CEST

This is an archived mail posted to the Subversion Dev mailing list.