Merge during checkout not updating local files
From: Steve Fogel <STEVE.FOGEL_at_oracle.com>
Date: Fri, 3 Dec 2010 17:38:12 -0800 (PST)
Can somebody please help me understand this odd behavior of TortoiseSVN (1.6.6, Build 17493) when merging during checkout?
I'm checking out a directory from the repository into an existing non-empty directory on my PC. This non-empty directory is downloaded from a vendor. Our repository files have desired additions and changes to the vendor's files. The checkout adds the files I want added, versions the directory and its subdirectories, and does a merge on text files (XML files) with the same name, according to the log.
However, the files that are reported as merged remain unchanged in the local directory (which is now a working copy), and they should have been changed, because the XML files in the repository have new code in them.
After the checkout, the local XML files are labeled as modified (due for a commit) as indicated by the icon overlays.
What is happening? What is the expected behavior? How can I merge the new code in the repository versions of the XML files with the local versions?
BTW, the "modified" dates of the text files in the repository are later than the "modified" dates of the text files in the local folder.
-- HYPERLINK "http://www.oracle.com/" \nOracle Steve Fogel | Information Architect, Oracle Database Phone: +1 6505064914 | Mobile: +1 4153098660 500 Oracle Parkway, M/S 4op1126 | Redwood Shores, CA 94065 HYPERLINK "http://www.oracle.com/commitment" \nGreen Oracle Oracle is committed to developing practices and products that help protect the environment ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2687680 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].Received on 2010-12-04 08:41:03 CET
This is an archived mail posted to the TortoiseSVN Users mailing list.