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

[TSVN] Couple of questions on TortoiseMerge

From: Brian Gangloff <brian.list_at_dataact.com>
Date: 2005-09-12 22:01:42 CEST

Up until recently I have mostly used TSVN for binary files, but have
started using TSVN for my website and have started to use TortoiseMerge
for diffing and merging. First let me say that it is a very powerful
tool, especially used with TSVN (but everyone else already knows that),
so now my questions:
1) Sometimes I will get a file, either download from my website or from
a contribution (for example phpBB2 for my forums), and it will show as
modified but when I "diff" it there aren't any differences? (I do have
"Compare Whitespaces" checked, AND I have "Ignore Lineending
(recommended)" check so THAT is probable my answer?).
2) Sometimes TortoiseMerge will pick the wrong line to compare, is there
anyway to force TortoiseMerge to compare the correct lines. Here is an
example
Working Base
- some long line of code (this line has been striked out)
  empty line
Working Copy
+ some comment of change begin
+ some long line of code (compared to empty line)
+ Some comment of change end

TortoiseMerge thinks that the orginal "some long line of code" has been
changed to the first comment, so it is not possible to see if there are
any real changes between the actual line of code. I would like to be
able to "bump" the "some long line of code" down so it can be compared.
If this is not possible, is there a work around.

I have installed TSVN 1.2.2

Thanks,
Brian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 12 22:02:06 2005

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