René Nyffenegger's collection of things on the web | |
René Nyffenegger on Oracle - Most wanted - Feedback
- Follow @renenyffenegger
|
Subversion: Working on the same file, part II | ||
Note: this page is part of Subversion basic operations.
In the meantime, an urgent bug fix must be made. It is required that honeydews be appended to the fruits.txt.
This being a bug fix, it is made by the support team:
C:\franz>mkdir \support C:\franz>cd \support
The support team maintains both languages, so they pull
project_text rather than project_text\language
C:\support>svn checkout file:///c:/svn_repository/project_text A project_text\english A project_text\english\fruits.txt A project_text\german A project_text\german\fruits.txt Checked out revision 3. C:\support>notepad project_text\english\fruits.txt
The support team adds the honeydews. Note, elderberry is not here because Mike has not yet commited his work.
apples bananas cherrys dates figs grapes honeydews C:\support>notepad project_text\german\fruits.txt
Similarly, the german translation for honeydews (Honigmelonen) is inserted. Note, Holunderbeere is already in the file because Franz has commited his work.
Äpfel Bananen Kirschen Datteln Holunderbeere Feigen Trauben Honigmelonen
The support team can now commit its work:
C:\support>svn commit project_text -m "Support: added honeydews" Sending project_text\english\fruits.txt Sending project_text\german\fruits.txt Transmitting file data .. Committed revision 4. |