Branch updating
Posted: Sun Mar 01, 2009 11:44 am
Again, I have no idea where to put this thread, so I just picked a forum. Something like "Development tools" or so would be very nice (merged into another forum of course, we don't want to have hundreds of forums).
I would like to talk about handling Subversion branches, specifically updating a student branch. Last semester three assistants had three different approaches...
Weighing the pros and cons I came up with mixture that should in my opinion meet our needs:
- Resolve conflicts exactly once when you update the branch, not twice, not later
- Having merged the trunk and the student's work
- Not having the unfinished student's work in the trunk
(I'm not talking about finished branches here!)
My suggestion is based on the following prerequisites:
- Student is working in a branch named "foobar"
- Student has not yet finished work
- The trunk has changes with significant impact on the student branch
I suggest to do the following:
- Create a new branch named "foobar2"
- Merge all the revisions from "foobar" to "foobar2"
- Tell to student to "svn switch" to the new branch
This resolves all the conflicts and also updates the student branch. I can also report that I have successfully tested this procedure when working on the build system.
(It is quite similar to what x3n has done last semester except there is no back merge to the trunk.)
What do you think?
I would like to talk about handling Subversion branches, specifically updating a student branch. Last semester three assistants had three different approaches...
Weighing the pros and cons I came up with mixture that should in my opinion meet our needs:
- Resolve conflicts exactly once when you update the branch, not twice, not later
- Having merged the trunk and the student's work
- Not having the unfinished student's work in the trunk
(I'm not talking about finished branches here!)
My suggestion is based on the following prerequisites:
- Student is working in a branch named "foobar"
- Student has not yet finished work
- The trunk has changes with significant impact on the student branch
I suggest to do the following:
- Create a new branch named "foobar2"
- Merge all the revisions from "foobar" to "foobar2"
- Tell to student to "svn switch" to the new branch
This resolves all the conflicts and also updates the student branch. I can also report that I have successfully tested this procedure when working on the build system.
(It is quite similar to what x3n has done last semester except there is no back merge to the trunk.)
What do you think?