Could someone please help me to understand how the issues outline below
can be resolved in Subversion.
I am currently evaluating Subversion as our corporate source code
repository. We have a large number of projects and about 20 development
I have read and understood "Version Control with Subversion for
Subversion 1.1 (book compiled from Revision 1337) by Ben
Collins-Sussman, Brian W.Fitzpatrick and C.Michael Pilato".
I am particularly interested in the branching and merging capability in
I will outline 3 scenarios below that were not covered in the "Common
Use-Cases" section and I would much appreciate if you could suggest how
the following problem could be overcome using Subversion.
I take a copy at revision 341 from trunk
I modify integer.c on my-calc-branch to create revision 342
Sally modifies button.c on the trunk to create revision 343
One week later I find that I need the changes Sally has made.
How do I get the changes in button.c into my branch.
Would this copy still be a cheap copy. ?? Should I use svn merge
or svn update. (I
would think svn update).
svn update http::/svn.example.com/repos/calc/trunk button.c
integer.c : 342
button.c : 343
Makefile : 341
On the second week Sally fixes a bug in integer.c.on the trunk to create
How do I get this change into my branch. (needs merging into my
incorporating my changes). Or should I do a svn update ?
Is it :-
svn merge -r 341:344 http::/svn.example.com/repos/calc/trunk
svn update http::/svn.example.com/repos/calc/trunk integer.c
This version ( I take it ) will be 345 once I commit it to my
2 weeks down the track Sally is still continuing to work on other bug
fixes to integer.c on the trunk and I was enhancing the functionality on
integer.c is now at revision 380.
How do I merge my change into the trunk. Which revision do I use?
Is it 345
svn merge -r 345:380
If it is 345 then would it ignore the first lot of changes Sally
did (344). But carry
into the trunk the changes I did in 342.
What if I was slack and did not commit the changes from Problem 2
immediately. My local copy revision will be 342. If I had done a
update then would it be 344.
Either way if I were to check in integer.c into my branch, it will
be at revision
How do I do the Merge into trunk. ie what revision number should I
svn merge -r 381:380
Any assistance in this matter will be very much appreciated.
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Thu Dec 8 12:22:19 2005