Re: display problem with TortoiseMerge

Am 25.06.2012 21:41, schrieb Stefan Küng:
> On 22.06.2012 13:39, Stefan Wild wrote:
>>> Changed this so that the three files compared are:
>>> BASE : the file before the update
>>> THEIRS: the file in HEAD
>>> MINE : the local file, probably with local modifications
>>>
>>> You can try a nightly build >= r23020
>>>
>>> Stefan
>>>
>>
>> thanks! I tried it, merge (green) now looks fine, but updated files
>> still compare with last revision, not my wc. (I see the changes I
>> just got AND the last changes I committed)
>
> Have a look at the picture in the docs here:
> http://tortoisesvn.net/docs/release/TortoiseMerge_en/tmerge-basics-conflicts.html
>
> What you see in the left and right view are the diffs between "theirs"
> and "base" (left) and "yours" and "base" (right).
>
> The view at the bottom shows then the result, i.e. your local file "yours".
>
> What files would you use to show here instead?
>
> Stefan

hm, I think that's right, conflicts (red) and merged files (green) seem to be ok
but when I get an updated file (black), what are the files then?
Base: my file before the update, e.g. rev.7900
Theirs: HEAD, e.g. rev.7901
Yours (Mine): is also my file before the update, e.g. rev.7900
"Merged": though no merge was necessary, it's HEAD, e.g. rev.7901

But it looks like it's comparing with rev.7899 (or less) in this example, a revision before I committed 7900.
That's what I mean, I can see the new changes and the old changes.
I used to look through the updated files to see what my coworkers committed (to either compliment or criticise them)
But curiously I see my last committed changes too.
I'm not good @ explaining, I know ^^

-- 
Mit freundlichen Grüßen
Stefan Wild
afr-consulting GmbH
Neefestraße 40
D-09119 Chemnitz
Germany
Tel.: +49 (0) 371 273327-48
Fax:  +49 (0) 371 273327-49
Mail: stefan.wild_at_afr-consulting.de
Web:  www.afr-consulting.de
Sitz der Gesellschaft: Chemnitz
Registergericht: Chemnitz, HRB 26394
Geschäftsführer: Axel Friedrich
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2973236
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].