[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: Tue, 21 Oct 2008 18:38:17 +0200

Thomas Lehmann wrote:
> Sorry for delay..
>
> On 20 Okt., 19:03, Stefan Küng <tortoise..._at_gmail.com> wrote:
>> 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?
>
> OK. At the top when moving the mouse cursor above the head line of one
> pane
> you can see the files location. For "Their" you see a path to a
> temporary file
> representing the file of the branch inside of the repository. I
> expected to see the
> URL to the location inside of the repository.

That's correct: you can't really diff a file which is in the repository.
You first have to fetch it from the repo and store it in a temp file,
and you see the path to that temp file.
But the view title itself should give you enough information about where
the file came from.

>>> 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.
>
> Why? ("can't really see")

Only if you have "show whitespaces" activated, you can see a dot for a
space and an arrow for a tab. Otherwise a tab will look identical to
four spaces.

Another thing you won't see: if the encoding of the file is different.
You would have to check the status bar: the encoding (ANSI/UTF8/UNICODE)
is shown there for every view.

>>> 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.
>
> Strange! I don't have done any merge to that file yet!

You didn't right-click on any line yet?

Stefan

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

Received on 2008-10-21 18:38:37 CEST

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