[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: Gert Kello <gert.kello_at_gmail.com>
Date: Fri, 3 Sep 2010 10:07:28 +0300

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

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

Gert

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

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

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