On Wed, 2009-06-17 at 09:47 -0400, Paul Mossman wrote: > Damian wrote: > > Scott Lawrence wrote: > > > > [...] > > > > > We are going to try to improve the stability of the > > mainline (4.1.x) > > > builds so that they are more usable during development. > > Ideally, they > > > will be usable right along, but they will always be significantly > > > higher risk than the 4.0.x 'stable' builds. > > > > > > To this end, significantly more feature work is going to be done on > > > branches during this release cycle, merging back to main (and thus > > > into the 4.1.x builds) only when the feature is believed to be > > > reasonably stable. > > > > I like it: while I am a big fan of "merge early and merge > > often" strategy we should refrain from submitting the code > > that does not work into mainline (what I mean by that: we are > > only humans, mistakes will happen - but there is no need to > > treat the mainline as a backup storage for unfinished code). > > > > Even smaller features can be developed and clean on a branch > > and git light branches are really good for that. And even if > > you are developing with someone you can use git hub to share > > you branches and get the feature in shape before getting it > > back to mainline. Of course svn branches are perfectly valid > > solution if you happen to be a fan of doing things the hard way ;-) > > Not that I'm suggesting we shouldn't use git... But having un-reviewed > code in an svn branch (vs. a patch file) makes the Crucible tool a lot > easier to use. > > For example (for those of you with access...): > http://code.sipfoundry.org/cru/CR-8 > > http://code.sipfoundry.org/cru/CR-8/edit-changelog/~author%3Dpaul.mossma > n/sipXecs/ > > http://code.sipfoundry.org/cru/CR-8/viewfile/CFR-93?bl=true&ws=b&u=-1&k= > > This is a review containing two revisions from and svn branch. The > author gets to choose which revisions, and even which files are > included. Reviewers also then have many more options for viewing the > diffs.
The next version of Crucible supports git. Longer term, I would very much like to migrate to git as our only source control system, and I love that Damian is out there on the bleeding edge. There are some integration issues with the rest of the project tool chain (like the one you point out Paul) that I'd rather let other people solve first, though. _______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev sipXecs IP PBX -- http://www.sipfoundry.org/
