RE: another merging issue

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

I don't think anything is wrong. When you do an "Update" and changes to a dirty file are merged into your working copy there is really no easy way to see the diffs. What you should do if you commit and it fails due to out of date WC file then do a Diff with URL at that point. This will show you the diff between what you have and what is in the repository.

You could try a BLAME but I'm not sure what that will show on a working copy.

You can also do a diff in the repository (log viewer) of the HEAD and the previous revision to see what changes that were made and merged into your source.

Of course, if you just DIFF your file would you not remember what changes YOU made and what changes are there that you didn't make?

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2654802

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-02 16:36:42 CEST