[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: Thomas Lehmann <t.lehmann_at_rtsgroup.net>
Date: Tue, 21 Oct 2008 05:06:33 -0700 (PDT)

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.

For my local checkout - of course - the info at the top is displaying
the correct
path... Does this help?

>
> > - 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?

No, I said: "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.

Why? ("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.

Strange! I don't have done any merge to that file yet!

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

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-21 14:08:59 CEST

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