[Gambas-devel] svn

[Benoit Minisini]

On Tuesday 03 October 2006 22:50, Charlie Reinl wrote:
> Salut,
>
> has anybody some hints for a newbe in svn, tool, better man/help-files
> as actually provieded for svn.
>
> I found the svn-book, but is there something like short
> help/first-steps?
>
> Amicalment
> Charlie
>

Actually daily use is very simple:

The first time you use it, you must import the repository. The entire 
repository is needed when developing with Gambas:

$ cd ~/gambas/2.0/trunk  # or whatever you want
$ svn checkout https://svn.sourceforge.net/svnroot/gambas/2.0/trunk

Everything is then put in the current directory.

The first time you commit, you will be asked for your username and password 
(or you can specify them on the command-line). These credentials will be 
asked once only.

Then, you can enter in the development cycle:

1) Develop...

2) Take the modifications from other users:

$ cd ~/gambas/2.0/trunk
$ svn update

You can have conflicts: another user has changed a file you have modified too. 
You must solve it by talking with this other user, and by modifying the file 
by hand. Then you run 'svn resolved XXXX' to tell svn the the 'XXXX' file is 
not in conflict anymore.

3) Look at what you have modified:

$ cd ~/gambas/2.0/trunk
$ svn status -q

This is useful for writing the change description.

4) Commit your changes. You should define an "EDITOR" environment variable 
that will points at your preferred text editor.

$ cd ~/gambas/2.0/trunk
$ svn commit

Your $EDITOR is launched so that you can enter the change description.

If you are very unlucky, you may have other conflicts if someone other 
modified the same files as you between 2) and 4). So you will have to got to 
2) again.

5) Everything has been commited. You can return to 1)

Just read the Chapter 3 of the O'Reilly book on SVN. You will have all what 
you need.

Regards,

-- 
Benoit Minisini