Stupid, stupid, stupid mistake

Hello

I'm new to subversion and I've just made a REALLY stupid mistake.
(I'm using TortoiseSVN to try to smooth out the learning curve)

I managed to deploy a subversion server, create a repository and put
my existing project under source control.
I was going along nicely, learning as I went then it happened.

I wanted to start a brand new project that used much of the code in
the existing one so ... and this still hurts when I think about it.
I forgot everything I had learnt about how Subversion manages change
and used Eclipse to copy the old project into the new one ...
.svn folders and all.

Somehow I managed to get this into version control under a new project
directory. In the meantime one of my
fellow developers continued working on the old project.

I expect you can imagine what happend next, as soon as I started to
try and commit my changes I started seeing
conflicts with code that the other guy had been adding to the old
project ... sheesh, that caused a 'cold sweat' moment I can tell you.

Anyway, I think I understand what's going on here

In the source tree of my new project, if I look at .svn/entries (for example)
I see something like this

https://very.stupid.mistake.org/reporoot/prototypes/oldproject/trunk
when I should be seeing this
https://very.stupid.mistake.org/reporoot/prototypes/newproject/trunk

I know, I'm [... insert insult here ...] but I'd really appreciate
any advice on how to retrieve the situation.

I was thinking maybe 'relocate' might do it but I'm a bit 'gun shy' of
trying new stuff without getting some sort of validation first.

Thanks

Sheepish

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-17 15:24:57 CEST