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

Re: Merge during checkout not updating local files

From: Dale McCoy <dalestan_at_gmail.com>
Date: Sat, 4 Dec 2010 05:12:10 -0500

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

This is not "odd"; it's as designed. "Merged", in the context of a
checkout into a non-empty folder, means "I found a file that has the
same name as something I was about to check out. I'm going to assume
that you don't want me to clobber the existing file."
If you do want the file clobbered, do something that makes that
obvious, such as deleting the file before you perform the checkout.

There are several other possible options:
1) Revert after the checkout.
2) Put the whole directory under version control, and stop downloading
anything from the vendor.
3) Check in exactly what the vendor provides, check out that, rather
than the latest local code, and then update (or possibly switch) to
pull down local changes.

Dale McCoy

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-12-04 11:12:17 CET

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