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

Re: Help merge question and problem

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 04 Dec 2009 19:04:31 +0100

On 03.12.2009 15:20, PJKint wrote:
> Hi,
>
> I have a question and a problem
>
> QUESTION
>
> A lot of work was done in a branch. I then did a merge of this branch
> into the trunk using TSVN.
>
> There is a folder in the branch, Installers, which is not in the
> working copy, nor the repository of the trunk. This is a very large
> folder (about 1Gb) and I wanted to avoid uploading/downloading it.
>
> What is the correct way to get the folder Installers created in my
> trunk from the branch?
>
> 1) Do I copy it in my windows explorer from the branch wc to the trunk
> wc, and select "SVN copy versioned items here" ?
>
> OR
>
> 2) Do I copy it in the repo browser from the branch to the trunk. If I
> do that, should I do it before or after I commit the merged changes of
> the trunk in my local wc? (figuring after).
>
> My thinking is that if I do 1), then when I commit it will upload a
> seperate copy of the files anyway, so it doesn't help much.

Not really, Subversion will only upload the data if you've modified the
big file locally. If it doesn't have local modifications, it won't get
uploaded but only the 'copied to here' information is committed.
But even if your files have local modifications, Subversion won't store
a full copy of those files but only a diff of the modifications.

>
> If I do 2) then I have the files in the repository, so no need to
> upload. However, later when I do an Update on my local trunk wc,
> won't it download the new files anyway?

Sure, it will download all files that don't already exist.

> Apologies if this is a dumb question; I'm trying to get on top of SVN/
> TSV but it's a learning curve..
>
>
> PROBLEM
> Now, apart from that issue, I have a further problem. I followed
> method 1 for 2 smaller folders that were in my branch wc but not in my
> trunk wc. These appeared in the trunk wc with a plus symbol, and so
> looks like they will be added. I performed a commit. However, at the
> end of the commit I received the following message, which involves one
> of the folders (KTDataMigrator7):
>
> Error Commit succeeded but other errors follow:
> Error Error bumping revisions post-commit (details follow):
> Error Unable to lock 'I:\Dev\Trunk\KTDataMigrator7\Forms'

This usually happens if another app has files open inside the .svn
folders. And that means that your virus scanner is to blame for this
since other apps know that they must not mess with files they have no
business with.

> Following this I see in the repo browser it looks like the commit has
> occurred as the message above says. However, the icons in my wc don't
> show this - they are still showing Changed icons on various files and
> the folders I added are showing Added icons.
>
> When I execute a cleanup on my trunk wc I get this message:
>
> Cleanup failed to process the following paths:
> - I:\Dev\Trunk
> In directory 'I:\Dev\Trunk\KTDataMigrator7'
> Error processing command 'committed' in 'I:\Dev\Trunk\KTDataMigrator7'
> Working copy 'I:\Dev\Trunk' locked
>
>
> What do I do now!?

1. get rid of your virus scanner
2. remove the folder I:\Dev\Trunk\KTDataMigrator7 (in explorer, not with
the svn command)
3. do an update to get the folder back properly

Stefan

-- 
        ___
   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=2427132
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-04 19:04:47 CET

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