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

Tortoise Merge Issues (1.5.0 RC4)

From: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: Tue, 06 May 2008 10:04:36 +0100

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

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

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.

Thanks again.

To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-05-06 11:04:59 CEST

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.