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

Subversion: Modifying the branch

Note: this page is part of Subversion basic operations.
In the meantime, it was discovered that there is a bug in release 1. All fruits are written in the plural from except elderberry which is in the singular form. This must be changed. 
C:\franz>cd \support
C:\support>svn update project_text_R1.0
At revision 8.

C:\support>notepad project_text_R1.0\english\fruits.txt
Now, let's examine the difference: 
C:\support>svn diff project_text_R1.0\english\fruits.txt
Index: project_text_R1.0/english/fruits.txt
===================================================================
--- project_text_R1.0/english/fruits.txt        (revision 8)
+++ project_text_R1.0/english/fruits.txt        (working copy)
@@ -2,7 +2,7 @@
 bananas
 cherrys
 dates
-elderberry
+elderberries
 figs
 grapes
 honeydews
\ No newline at end of file
As can be seen, elderberry was changed into elderberries.
Same thing for the german text: 
C:\support>notepad project_text_R1.0\german\fruits.txt

C:\support>svn diff project_text_R1.0\german\fruits.txt
Index: project_text_R1.0/german/fruits.txt
===================================================================
--- project_text_R1.0/german/fruits.txt (revision 8)
+++ project_text_R1.0/german/fruits.txt (working copy)
@@ -2,7 +2,7 @@
 Bananen
 Kirschen
 Datteln
-Holunderbeere
+Holunderbeeren
 Feigen
 Trauben
 Honigmelonen
\ No newline at end of file
Old: Holunderbeere, new: Holunderbeeren.
Commiting the changes: 
C:\support>svn commit project_text_R1.0 -m "Correcting wrong singular form"
Sending        project_text_R1.0\english\fruits.txt
Sending        project_text_R1.0\german\fruits.txt
Transmitting file data ..
Committed revision 9.
<<Prev ^up^ Next>>