Branch updating

Everything concerning SVN, our wiki and this forum.

Moderator: PPS-Leaders

Post Reply
User avatar
1337
Baron Vladimir Harkonnen
Posts: 521
Joined: Wed Oct 10, 2007 7:59 am

Branch updating

Post by 1337 » 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?
http://www.xkcd.com/
A webcomic of romance, sarcasm, math, and language.

User avatar
greenman
Baron Vladimir Harkonnen
Posts: 360
Joined: Wed Oct 03, 2007 2:53 pm
Contact:

Post by greenman » Sun Mar 01, 2009 12:06 pm

ACK
There are only 10 types of people in the world: Those who understand binary, and those who don't.

User avatar
BadElvis
Human Space Navy Lord Commander
Posts: 83
Joined: Wed Nov 14, 2007 1:07 pm
Contact:

Post by BadElvis » Sun Mar 01, 2009 6:32 pm

/me is glad to be a modeller

User avatar
x3n
Baron Vladimir Harkonnen
Posts: 810
Joined: Mon Oct 30, 2006 5:40 pm
Contact:

Post by x3n » Mon Mar 02, 2009 10:40 am

fine
Fabian 'x3n' Landau, Orxonox developer

User avatar
beni
Baron Vladimir Harkonnen
Posts: 949
Joined: Tue Oct 03, 2006 9:15 am
Location: Zurich
Contact:

Post by beni » Mon Mar 02, 2009 11:11 am

Sounds great. Would also have been my suggestion. There are no additional merges so no additional error sources and it's as convenient as it gets.
"I'm Commander Shepard and this is my favorite forum on the internet."

Post Reply

Who is online

Users browsing this forum: No registered users and 5 guests