Help merge question and problem

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.

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?

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'

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

Thanks and regards
Paul

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-03 15:22:19 CET