Re: [Tikiwiki-devel] Subversion migration : Done

[Nyloth <ny...@ti...>]

Hi all,

The migration of our CVS repository to a new SVN (Subversion) repository is 
done !

Only branch 1.10 has been migrated. Branch 1.9 will remain, as discussed 
before, on CVS. I've tested it as much as possible and already reorganized 
its structure after discussions that occured by mail and on IRC. I didn't 
noticed any problems, so there is no reason to wait more (or we would have to 
migrate again, which is a long and painful job, believe me ;) ).


So... Please do not commit anymore on CVS for branch 1.10 NOW !

The new SVN repository URL, for branch 1.10 is :
  https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/1.10


First, the reference documentation for subversion:
  http://svnbook.red-bean.com/


Below are basic command lines to know. If you were using GUI like TortoiseCVS, 
just download TortoiseSVN instead ;)

* To list content of 1.10 branch on the server:
  svn ls https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/1.10

* To checkout the 1.10 branch:
  svn co https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/1.10 
checkout_directory

* To build a new 1.10 tiki (without SVN specific files):
  svn export 
https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/1.10 
DEST_DIRECTORY

* To update a checkout:
  cd checkout_directory
  svn update

* To see what will be commited
  cd checkout_directory
  svn status
  svn diff

* To commit something inside a checkout
  cd checkout_directory
  svn commit # or with an inline message: svn commit -m "[FIX] my fix...."

* To see the log of commit messages
  cd checkout_directory
  svn update #this is to be sure to have the last log entries
  svn log # or page by page: svn log |less


Those commands are faster if you use them on one precise directory or file 
(e.g. svn log tiki-index.php ; svn diff lib/ ; ...) 

Your sourceforge login/password will not be necessary until you commit 
something.
This means that anonymous and developper access are the same... This is very 
nice :)

Note that if you have a message like this one when trying to commit, it means 
that your password has expired and you need to login through sourceforge's 
web interface to change it:
  svn: Commit failed (details follow): 
  svn: MKACTIVITY 
of '/svnroot/tikiwiki/!svn/act/eac4ef53-cc7f-4415-ae1e-da1bac94a2ce': 
authorization failed (https://tikiwiki.svn.sourceforge.net)


About the repository directories structure now...

Subversion is usually structured a bit differently (but better from my point 
of view) compared to CVS. There is generally three directories at the root 
level:
  - trunk/     => this is the development version (future 2.0), where most of 
developments are made. New functionnalities are added here,
  - branches/  => this is where released branches continue to live (e.g. in 
order to backport fixes from trunk),
  - tags/      => this is where we store a "snapshot" of each release. There 
should be no code modifications here.

We will have those "standard" directories + some others. There will be at 
least two additional directories:
  - third_party/ => this contains one subfolder per third party library that 
is used by tiki but should not be modified (except to update it).
  - mods/ => this contains the code of tiki mods, available on 
mods.tikiwiki.org

So, this means that we will now have this directory structure inside our 
repository:
  
  trunk/
  branches/
    1.10/
  tags/
    1.10.0b/
  mods/
    trunk/
    branches/
      1.10/
  third_party/
    adodb/
    fckeditor/
    jscalendar/
    phplayers/
    smarty/
  
This means, for those who want to work on mods, that they will have to 
checkout the mods directory this way:
  https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/mods/trunk


=== IMPORTANT NOTES ===
As you can see, I didn't created some directories yet:

* trunk/ : this is the main directory, where you should commit all new stuff. 
The problem is that since branch 1.10 has been created in the CVS, the CVS 
HEAD was dead. Nobody has merged back things into head. We are in a special 
case that should not happen and I choosed to keep this state until 1.10 goes 
into freeze. When nkoth will announce that a freeze starts for 1.10, I'll 
create the trunk as a copy of branch 1.10 and you will all be able to commit 
in trunk as it should already be. Then, nkoth or others will simply backport 
bugfixes from trunk to branch 1.10.

* mods/branches/ : this is because we never had branches for mod before, so no 
urgency.

* tags/1.10.0b/ : this is not an urgency too, but I'll create this tag asap to 
be clean. Just have to find the right subversion revision that should be 
used :)

Another important thing: Do NOT touch to libs of third_party, neither in 
third_party directory, nor in branches/x.x/lib/ or trunk/lib/ ... the two 
last ones are "specials" because they use svn capabilities (svn:externals 
property) to point to those in third_party directory. It's like links. They 
are there just to make it easier to have a running tiki with all needed libs 
from a checkout of trunk or a branch.


Thanks for everybody who helped me to test :)

Cheers,
Nyloth.