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

Re: Visual Merge - few issues...

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 20 Oct 2008 19:03:49 +0200

Thomas Lehmann wrote:
> Hi,
>
> I'm using Tortoise 1.5.4...
> About merging (TortoiseMerge)...
>
> - When displaying "Theirs" you can not see the
> real location! Did I miss an option?

Can you explain?
Where did you expect to see the real location? What do you consider as
the 'real' location?

> - Sometimes it happens that one difference has
> been displayed side by side being identical!
>
> a) I have adjusted to see all characters!

But do you also have TMerge set to not ignore whitespaces?

> b) I see assignment icons on the left side for each line;
> In the middle there is one another icon (grey circle).

The grey circle means that those lines differ only in whitespaces.

> The cirlce does mean changes in whitespaces but
> I don't see any difference!

Then either you've configured TMerge to ignore whitespaces, or there's a
whitespace change (tab to spaces, ..) you can't really see.

> The equal icon has something to do with undo
> operation; I don't see differences in the code between
> left and right. Could someone explain this please?

The equal icon indicates that you've used some 'use line from' and now
the lines are identical.

Stefan

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

Received on 2008-10-20 19:04:06 CEST

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