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

Re: Question about merging

From: Ryan J Ollos <ryano_at_physiosonics.com>
Date: Tue, 15 Dec 2009 14:11:52 -0800 (PST)

David Huang-5 wrote:
>
> So, I tried doing that, and I think it mostly worked, but a lot of files
> were unexpectedly shown as "Updated"--I have no idea why they show up in
> the
> merge, since they haven't been modified between branch1 and branch1.1. It
> seems to be harmless though; even though merge shows them as Updated,
> they're not actually modified in the WC after the merge is done.
>

Pay close attention to whether the files are shown as having text
modifications or property modifications. It is very likely that just the
mergeinfo or another property on the files has changed.

-- 
View this message in context: http://old.nabble.com/Question-about-merging-tp26735112p26802735.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2430653
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-15 23:12:02 CET

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