[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: Bob Archer <Bob.Archer_at_amsi.com>
Date: Mon, 6 Dec 2010 15:22:21 -0500

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

Interesting... I tried it both ways... with new code in the non-versioned directory that I merged into and also with some code not in the non-versioned directory. In both cases it showed the changes. Keep in mind what is in the repository shows as the BASE. Version. So, in the case the change shows that the "new code" in the repository is going to be deleted if you do a commit.

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

ah... so it seems you are talking about "AFTER" the commit. Yes, after you commit you are going to get whatever was in the non-versioned directory prior to your checkout. Probably the opposite of what you want I'm sure. After you do your checkout you will have to go through each changed file and put the "new code" into them.

You probably need to use vendor branches. Or... at least create a patch from the vendors diffs and apply that to your own copy of the code so as to get the new code.

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

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-12-06 21:22:31 CET

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