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

Re: Crash in TMerge

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-10-11 00:38:46 CEST

On 10/10/2007, Simon Large <simon.tortoisesvn@googlemail.com> wrote:
> On 10/10/2007, Stefan Küng <tortoisesvn@gmail.com> wrote:
> > Simon Large wrote:
> > > On 10/10/2007, Stefan Küng <tortoisesvn@gmail.com> wrote:
> > >> Simon Large wrote:
> > >>> On 09/10/2007, Simon Large <simon.tortoisesvn@googlemail.com> wrote:
> > >>>> On 09/10/2007, Alexander Klenin <klenin@gmail.com> wrote:
> > >>>>> On 10/9/07, Simon Large <simon.tortoisesvn@googlemail.com> wrote:
> > >>>>>> Hi Stefan,
> > >>>>>>
> > >>>>>> Using r10916, in TMerge diff a file. Left click on any line then right
> > >>>>>> click and select Use other text block. Boom.
> > >>>>> Works for me in HEAD build.
> > >>>>> Either Stefan has already magically fixed this, or it does not always happen.
> > >>>>> What files are you diffing?
> > >>>> I will have to try when I get back home. But as I remember it was just
> > >>>> about any file. Diff a modified file or pick 2 different files in
> > >>>> explorer and diff them. I was generally selecting unmodified lines in
> > >>>> the right pane.
> > >>> 1. In TortoiseSVN/src select changelog.txt and COPYING.txt in explorer.
> > >>> 2. TSVN Diff
> > >> Which file is on the left, which is on the right side?
> > >
> > > Doesn't make any difference.
> > >
> > >>> 3. Right click on a word in the top line in the left pane.
> > >>> 4. Select 'Use this text block' from the context menu.
> > >>> 5. Kaboom
> > >> Which version do you use? I can't reproduce this here :(
> > >
> > > r10916
> >
> > Hmm - there were no changes since that revision that could have an
> > effect on TortoiseMerge.
> >
> > What are your settings in TortoiseMerge? I've tried several different
> > settings, but still couldn't get it to crash.
>
> Nothing unusual - see the screenshot.
>
> > btw: what's the exact crash message you get?
>
> Another screenshot.
>
> I'm using Win2K if that's relevant.

Update: I uninstalled TSVN and rebooted. I installed r10935 and
rebooted. Tried the same recipe and it still crashes.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Oct 11 00:38:52 2007

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

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