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

Re: Tortoise Merge Issues (1.5.0 RC4)

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 06 May 2008 19:48:28 +0200

Dave Lawrence wrote:
> 1) If a new block of text is in the right hand window (on a 2-way view)
> so the corresponding block on the left is a grey "nothingness", if I
> select "Use other text block" I expect the block to be removed
> completely, however what seems to happen is that it replaced with a
> number of empty lines. eg if the text block was 4 lines long, then it
> is replaced with 4 linefeeds, instead of just being removed

If you save the file, those lines are really removed. So no problem
there. The line endings are still shown to make sure that if you undo
(Ctrl-Z) your changes that the line endings are kept.

> 2) If I delete lines in the right hand window, the same lines dissapear
> from the left window, I'm not sure this is correct

Sure it is. Otherwise we'd have to show 'empty' lines on the right view
instead of removing them - that would confuse users even more.

> 3) When I select "diff with previous version" the right hand window uses
> a temp file. I would have expected it to use my working copy so I could
> selectively (reverse) merge the differences.

Fixed in r12863.

Stefan

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

Received on 2008-05-06 19:48:47 CEST

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