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

RE: another merging issue

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 3 Sep 2010 11:33:48 -0400

> >> 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
>
> I actually fail to understand this statement:
> After You update Your working copy, *ALL* remaining changes in WC
> are made by *"You"*. The merged ones are not changes, they are part
> of working copy BASE now.

Doh! Good point. But, I think he is saying he wants to see what changes were merged in that he didn't originally have in BASE.

In other words... he has myfile.txt in his WC with a BASE or r100. He works on it for a while and then does an update. He sees that myfile.txt was "Updated" with no conflicts. No his BASE is r123... he wants to right click on the file in WC and see the diffs that he just brought down, in other words what changes were made between r100 and r123. There is no way to do that diff in regards to the working copy file. (Which I totally understand)

 
> If You want to see changes updated into working copy, then, as
> usually, get diff from "Log" window.
>

I also advised this... ;)

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-03 17:34:12 CEST

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