René Nyffenegger's collection of things on the web
René Nyffenegger on Oracle - Most wanted - Feedback -
 

Subversion: Working on the same file, part I

Note: this page is part of Subversion basic operations.
The project manager decides that there needs to be a fruit whose english name starts with e: elderberry.
Mike, the maintainer for the english part, changes that in the english file: 
C:\franz>mkdir \mike
C:\franz>cd \mike
Of course, he needs his own working copy, just like Franz does: 
C:\mike>svn checkout file:///c:/svn_repository/project_text/english
A  english\fruits.txt
Checked out revision 2.

C:\mike>notepad english\fruits.txt
After adding elderberry, the english file now looks like this:
english\fruits.txt
apples
bananas
cherrys
dates
elderberry
figs
grapes
Of course, Franz will have to modify (that is: to add Holunderbeere) the german text as well: 
C:\mike>cd \franz
C:\franz>notepad german\fruits.txt

Äpfel
Bananen
Kirschen
Datteln
Holunderbeere
Feigen
Trauben
Franz commits his work. Note, Mike did not. 
C:\franz>svn commit german -m "Added Holunderbeere (for elderberry)"
Sending        german\fruits.txt
Transmitting file data .
Committed revision 3.
<<Prev ^up^ Next>>