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

Question to Merging and Merge Tracking

From: tmto <tmto_at_arcor.de>
Date: Thu, 18 Sep 2008 07:11:29 +0200

Hello,

i have a question to Merge Tracking. The Subversion Server uses version
1.5.2 and the TortoiseSVN Client has the version "TortoiseSVN 1.5.3,
Build 13783 - 32 Bit , 2008/08/30 20:59:46".

I have made some change in the trunk that i would like to merge to a
branch. So i went to the branch and have chosen "TortoiseSVN" -->
"Merge". In the dialog box "Merge Type" i selected Merge a range of
revisions. In the field Url from I set the trunk URL. The revision range
text box was leaved blank to merge all revisions. The Merge status
dailog showed me the right three files to change. But if I check my
working copy branch path with "check for modification" some other files
has a change svn property "svn:mergeinfo that has change form "Working
Base" to "Working Copy". May be OK but why not all files? I don`t
understand?

Hope somebody can explain it.

Cu
tmto

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-18 07:17:01 CEST

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