On 13.06.2012 09:19, Stefan Wild wrote:
> Hi,
>
> when updating my wc I often check what I got with double-click or right-click->Compare with wc.
> If the file was updated (black text), double-click opens the file (ok), and compare opens TM. It shows the changes I just got (ok) AND the last changes I committed (??!).
> If the file was merged (green text), double-click shows TM with my uncommitted changes (ok), and compare opens TM with the following examples:
> svn-block ($Rev $Date $Author):
> - Theirs shows = deleted new data, + added old data
> - Mine shows new data without marking
> - Merged shows - deleted new data, + added old data
> - file contains new data
> an added function that is new to my wc:
> - Theirs shows = deleted new data
> - Mine shows new data without marking
> - Merged shows - deleted new data
> - file contains new data
> a not committed comment from me:
> - Theirs shows line without comment without marking
> - Mine shows = deleted line without comment, + added line with comment
> - Merged shows - deleted line without comment, + added line with comment
> - file contains line with comment
>
> the last example works as expected, but the other 2 are confusing... I would expect to show my changes (if existing) @Mine, changes I got from repo @Theirs and the resulting file @Merged.
> Because the resulting file is always correct, I think that's only a problem of displaying the right information.
>
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
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2972504
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-06-21 20:58:01 CEST