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

Subversion: Merging

Note: this page is part of Subversion basic operations.
Franz and Mike want to apply the changes of the bugfix (elderberry=>elderberries) into their working copy:
When the project_text_R1 directory was copied into the repository, the revision 6 was created. When the bugfix was commited, revision 9 was created. So, we have to apply (merge) all changes between revision 6 and 9 that happened in the project_text_R1 directory. 
C:\support>cd \mike

C:\mike>svn merge -r6:9 file:///c:/svn_repository/project_text_R1.0/english english
U  english\fruits.txt
If Mike now looks at his file, he will see the bugfix:
english\fruits.txt
apples
bananas
cherrys
dates
elderberries
figs
grapes
honeydews
imbes
jostaberries
So, he can commit this new file: 
C:\mike>svn commit english -m "Applied bugfix in Rel 1"
Sending        english\fruits.txt
Transmitting file data .
Franz does the very thing on his part: 
C:\mike>cd \franz

C:\franz>svn merge -r6:9 file:///c:/svn_repository/project_text_R1.0/german german
U  german\fruits.txt

C:\franz>svn commit german -m "Applied bugfix of Rel 1"
Sending        german\fruits.txt
Transmitting file data .
Committed revision 11.
<<Prev ^up^