Skip to main content.

Wednesday, July 28, 2004

CVS Tags & Branches

For your reference (and for my own), here's an overview of the branches and tags applied to the CVS repository:

Main Branch

This is the branch in which all regular development takes place. It has a bunch of tags:

  • Nucleus 2-0-RC: Code that was released as Nucleus v2.0 RC
  • Nucleus-2-5-beta: Code that was released as Nucleus v2.5 beta
  • Nucleus-3-0-RC: Code that was released as Nucleus v3.0 RC
  • Nucleus-3-0: Code that was released as Nucleus v3.0 (minus one fix to backup.php)

"avendor" Branch

Should be ignored. I assume it was added by CVS when I first imported Nucleus into the repository. The branch splits from the main branch at the very first revision (1.1) and contains an extra label arelease.

"Branch-Nucleus-2-0" Branch

I added this branch point at the moment when Nucleus v2.0 got released. It doesn't have any revisions underneath, so it shouldn't be looked at as a real branch. It could probably be used as label to get all files that were included in the v2.0 release.

"Nucleus-3-0-1" Branch

This branch should be ignored. I messed up creating it, ending up with only part of the files present in the branch. v3.01 was not based on this branch, even though I committed some changes to it.

The branch was made on the files having the Nucleus-3-0 tag

"Nucleus-3-1" Branch

This is an actual branch, which branched away from the main branch on July 26, 2004. The goal was to base v3.1 and v3.1 patch levels on this branch.

Currently, there's one tag on this branch: Nucleus-3-1-p0, which points to the files included in the final Nucleus v3.1 release.

Posted by karma at 18:51:25. Filed under: CVS

Comments

Just wondering, for new features to be sumbitted, we should be submit to Nucleus-3-1?

Posted by admun at Wednesday, July 28, 2004 19:04:49

@admun: No, all changes should go in the main branch. The Nucleus-3-1 branch is for when we need to create security patches without having to include the very last CVS code. Also, when we're ready to create a patch-level release, we'll take the differences from the main branch and move them over to the Nucleus-3-1 branch

Posted by karma at Wednesday, July 28, 2004 19:37:58

cool. ic

Posted by admun at Wednesday, July 28, 2004 20:23:05

Oh, one other question. I assumed the chnage in 3.1 branch will be merged back to main some point in time, true?

Posted by admun at Wednesday, July 28, 2004 20:58:25

@admun: yes. What I did in the past days was to commit changes both to the 3.1 and main branches. So both branches have been the same (except for the version number & debug flag) until now.

What I actually should have done was to keep working on the main branch until v3.1 was released. At that point I should just have added a tag (as I did with earlier releases). The branch should only have been created afterwards , when a fix or patch release has to be released (using the tag as branch point). As you see, I'm still learning myself :)

Posted by karma at Thursday, July 29, 2004 08:52:01

yeah, it should be how it's done. 8)

At work, we have a main branch and each project branch off at some point, do the development and merge back in afterward.... never works well since too much change going on. Too much maintainese to port fixes from branch to branch.

Posted by admun at Friday, July 30, 2004 04:46:11

Add Comment

This item is closed, it's not possible to add new comments to it or to vote on it

Previous Item - Archives - Next Item