On 4 December 2010 01:38, Steve Fogel <STEVE.FOGEL_at_oracle.com> wrote:
> Hi, all…
>
> 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?
In this instance checkout behaves in a similar way to update and shows
your local files as modifications to what is already in the
repository. So anything marked as unmodified matches what was in the
repository at the time you did the checkout. Files marked as modified
contain the same content as before you did the checkout, but the BASE
revision is the one from the repository. You will have to diff each
file separately to see which of the lines marked as changed you want
to keep.
If this sort of update is a regular occurrence you might want to look
in the subversion book at the section on Vendor Branches.
Simon
--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2687785
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-12-04 13:38:15 CET