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

Re: runtime error in TortoiseProc while merging

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 26 Feb 2009 18:18:07 +0100

Gleason, Todd wrote:
>> -----Original Message----- From: Stefan Küng
>> [mailto:tortoisesvn_at_gmail.com] Sent: Wednesday, February 25, 2009
>> 12:26 PM To: users_at_tortoisesvn.tigris.org Subject: Re: runtime
>> error in TortoiseProc while merging
>>
>> Gleason, Todd wrote:
>>>> What merge info do you enter in the TSVN merge wizard? Using
>>>> that
>>> info,
>>>> we can re-create the exact svn command you should try with the
>>>> CL
>>> client.
>>>
>>> Merge a range of revisions, with the revision selection left
>>> blank. All other options are left at the defaults.
>>>
>>>> Also, at what point during the merge does TSVN crash?
>>> I get only one line in the progress dialog, saying that it is
>>> merging revisions X:HEAD. I think it takes somewhere in the
>>> range of 30 seconds to 2 minutes to crash.
>> Can you try the command
>>
>> svn merge -rX:HEAD https://[server]/[path]/tags/[tag path] .
>>
>> (without the --non-interactive, since I suspect a problem with the
>> interactive resolving).
>
> I can try this, but the problem is that the place where I really want
> to do this merge has thousands of files changing, and there are
> perhaps hundreds of conflicts.
>
>> Also, can you try merging with TSVN and in the progress dialog
>> check the checkbox "merge non-interactive" ?
>
> As I said in the initial message:
>
> I have "Merge non-interactive" selected but I haven't seen this make
> a difference.
>
> Basically I start the merge and then check this box right away. So
> it seems to me that I am comparing apples to apples...
>
>> The error "This application has requested the Runtime to terminate
>> it in an unusual way." is only shown if the application called
>> exit() or abort(). And TSVN never does that, only (unfortunately)
>> the svn lib does.
>
> This seems very strange, since again, I'm merging non-interactively
> in both cases. Is it possibly that you have to invoke the Svn
> library merge interactively, and then handle it in a non-interactive
> way if the user has checked this box? That might explain what you're
> telling me.
>
> One other thought: Do you think that connecting to this with WinDBG
> or ADPlus or something would allow me to get better information?

I don't use WinDbg that often. But I guess that the abort() call works
against this goal since it aborts the whole process.

Can you maybe try a nightly build? Maybe the crash is already fixed. But
if not: in 1.6, Subversion finally got rid of abort() and exit() calls
and replaced them with a custom exception handler. TSVN in this case
shows an error dialog with the source code location where the problem
originated and any info it gets from that exception. Which would make
this a little bit more suitable to find the problem.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1233926
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-02-26 18:18:31 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.