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

another merging issue

From: Stefan Wild <stefan.wild_at_autinity.de>
Date: Thu, 02 Sep 2010 11:27:53 +0200

Hi all,

reading the last discussion about conflict merges reminded me of a "problem" I always have when I make an svn update on my working copy.
If there was something changed and committed by anyone else and I changed something in the same file, this usually results in a (non-conflict) merge and the filename is shown in green.
But now the problem:
how can I find out which changes in that file were made by me and which changes came from the newer revision I just got? I can double-click on this file or right-click -> "Compare with working copy" (which is bold, so it'd be to expect the default double-click action), and both of those shows me some kind of diff, but it's neither the same like the other one nor the diff I would expect.
What I *would* expect was:
= for changes that were made in both revisions
+ on the left side for changes commited by someone else
+ on the right side for changes that I made in my wc

now I'm unsure if *I* do something wrong or tsvn does...
any suggestions?

-- 
Mit freundlichen Grüßen
Stefan Wild
autinity systems GmbH
Neefestraße 42
D-09119 Chemnitz
Amtsgericht Chemnitz HRB: 21552
Telefon: +49 (0) 371 918897-50
Fax:     +49 (0) 371 918897-49
email:   stefan.wild_at_autinity.de
web:     www.autinity.de
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2654470
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-02 11:30:55 CEST

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