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

Re: Crash during interactive merge resolution

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 30 Jul 2008 16:28:21 +0200

Kari Grano wrote:
> Hi devs,
>
> TSVN 1.5.1 crashed during interactive merge resolution. Here's what I did:
>
> - merge single revision from one branch to another
> - merge resulted in conflict, and the resolution dialog was opened
> - I edited the conflict and then clicked "Resolved"
>
> This happens on Vista x64. The server and repository are both 1.4.2. One
> more note: When the conflict resolution is postponed, everything works as
> expected.
>
> I'll attach the crash dump (for some reason, the automatic mail sending
> feature during crash does not work for me - it cannot find my email
> configuration and instead fires up the Windows Create Internet Connection
> wizard).

http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=669784

You can try a nightly build: it has a workaround for this bug, but since
it's only a workaround it won't work in all cases (but fortunately: in
most cases).

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-30 16:28:45 CEST

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