n00b repository question

Hi,

Firstly, I'm a complete n00b at subversion - in fact, I installed it
less than 2 hours ago.

I'm currently reading the book, but I can't see, or maybe I'm just
missing it, whether or not I can get it to do what I need. Here's the
situation;

Website developed outside subversion - customised for my employer.
New website from the supplier which has to replace the "live"
website.... BUT our changes to the "live" site must be merged into
the new one from the supplier, and then released...

I've created a repository containing the "vanilla" site and that went
OK.

I would have thought that the easiest way to do this would have been
to make the "live" site the working copy and then merge stuff
back.... but possibly not. When I copied the "live" site to the
directory I used for the checked-out working copy, I get "directory
not locked" errors when I try to commit...

If someone can give me a solution, or pointers thereto, I'd be most
appreciative.

Jon

---------------------------------------------------------------
Some people says that if you play a Windows XP install CD backwards
you will hear demon voices commanding you to worship Satan". But
that's nothing. If you play it forward it will install Windows XP !!
Received on Tue Aug 1 04:14:48 2006