subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan K√ľng <>
Subject crash when merging
Date Mon, 03 Jun 2013 18:13:23 GMT

I've got a small problem. As reported on the TSVN mailing list here:

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:
		  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?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\

View raw message