RapidSVN - graphical user interface
|
A graphical user interface (GUI) to Subversion - RapidSVN - is installed at the departments computers,
but can be installed at home as well (also for Windows).
Take a look at the screenshots.
Checkout from repository
Do the following when you begin working with Subversion and do not have a working copy of a repository or and path on your computer.
-
In the menu choose Repository->Checkout.
-
Fill in the field URL the address of the repository,
like https://svn-stat.math.ethz.ch/concepts/trunk.
-
Fill in the field Destination directory the local path, you want to work with,
like /hg/u/kersten/concepts.
-
You will be asked for your username and password.
Your local working copy (/hg/u/kersten/concepts) is now in the bookmark list.
Bookmark your working copy
If you already have your working copy, e.g. you used the command svn checkout,
-
add it as bookmark via Bookmarks->Add Existing Working Copy in the menu.
-
Select your directory of choice.
-
You will be asked for your username and password.
Main commands
You will mainly work with the bookmark working copy. On the left side you can switch inside the bookmark between the subdirectories.
On the right side you see all files in your working copy. Files, which do not stand under version control are marked with ?.
Red document symbol means, the file has local changes. An red symbol C means, there are conflicts to resolve.
| - |
Update
| | There is sign with green arrow. You can update single files or directories.
Update every time before you commit (see Rules of conduct). If your file is marked with an C now, you have to solve an conflict.
| | - |
Add
| | Click with the right mouse button on file or directory you want to add, and choose Add. Commit your adding order.
| | - |
Commit
| | There is a sign with red arrow. You can commit single files or directories. Update ever before you commit
(see Rules of conduct). Use meaningful log messages.
| | - |
Make directory
| | In the menu choose Modify->Make directory. The directory is created in your working copy and will be created at the repository, when you commit.
(see Subversion principles).
| | - |
Solve conflicts
| | After updating there can occur conflicts, if Subversion was not able to merge your local changes with the changes in the repository.
That happens if there are changes in the same paragraphs. Now, in the file both version are among themselves.
Edit the file (locally), and merge manually. Then click on the symbol with yellow check mark, and commit the file in the following.
| | - |
Versions log
| | Click with the right mouse button on file and choose Log. You will see the history of this file.
Click on one line of the history, then the log message will appear. You can mark two versions and see the difference with Diff (see more
below).
|
Watch changes
With tools like tkdiff or
kompare from KDE you are able to see differences between your
local copy and any revision in the repository or between two revisions.
Setting up
| - |
Setting up
| | Choose in the menu View->Preferences->Programs, and fill in the field Diff Tool either kompare or tkdiff.
For kompare fill in Program arguments %2 %1.
| | - |
Compare local version
| | Click with the right mouse button on the file and choose Diff to Base or Diff to Head.
The first shows your changes since your last commit, the second shows the difference with the current version in the repository.
If you commited as last, Base and Head are the same
| | - |
Compare two versions
| | Mark two version at the Log of your file (see above), and click on Diff.
|
|
