Best practice for moving folders around?

Dear List,

Can I ask your suggestions on how best to correct the following
scenario:

In a new repository we checked a version of the product code into
'trunk' (moving projects from VSS, finally). This was cp'd to
'tags'/tag1. A new svn user then cp'd 'tags'/tag1 to 'tags'/tag2 and
checked this out as a working copy:

[project] -> 'trunk'
'trunk' -> 'tags'/tag1
'tags'/tag1 -> 'tags'/tag2
'tags'/tag2 -> (wc)
(wc) -> 'tags'/tag2

Several updates later we have discussed the idea of what is a 'tag',
'branch' and the 'trunk' and have decided that the development should
have occurred in 'trunk' (small teams of one or two so no perceived need
for developer branches) and that we should create a new 'tags'/tag2 for
the release version.

How do we best achieve this, preserving as much history as possible? I
can think of several possible solutions:

1) merge 'tags'/tag2 into trunk, delete 'tags'/tag2 then create new
'tags'/tag2 from trunk?

2) delete 'trunk', move 'tags'/tag2 to become 'trunk', create new tag

3) I'm sure I could think of worse ideas

I welcome your suggestions on the best solution. We are hosting svn
1.6.6 on windoze server (via apache) and using latest tortoise from
windoze clients. I have to admit that I've used svn pretty much as a
solo developer for several years now and never needed to branch/merge.
Now I find myself as admin for several small teams across departments
and in need of guidance.

Many thanks,

~ mark c
Received on 2010-05-11 16:52:53 CEST