Sean M. Pappalardo wrote: > Robin Sheat wrote: > >> On Friday 01 May 2009 00:35:19 Sean M. Pappalardo wrote: >> >>> The 1.7 branch is in feature-freeze, so only patch against it if your >>> changes are fixes rather than new features. >>> >> So which branch is the recommended one to work against? >> > > For new features? None right now. There are some new things in trunk > that are not in the branch and many fixes in the branch that are not yet > in trunk. > > For new features, I'd advise branching off of the release branch. It's no different than what the LP trunk will look like once we merge it, so merging features from a branch made off of lp:mixxx/1.7 will be the same as if they were originally branched from trunk.
I agree that the way it should work is people branch trunk or whatever, then propose their branch for merging. Then the trunk maintainer can merge their stuff. For small patches, you can have a mixxx-trunk branch that you keep up to date, and then any commits you make to your local branch, you can package up into what bazaar calls a 'merge directive'. This can either be a file that you email to the list (like a patch), or it can show up on Launchpad as a 'merge request'. The `bzr send' command is good for lightweight changes. To make a file that you can email, do `bzr send -o mycode.patch'. The patch has your commit information as well as the diffs for the commits, and attribution information. Then its very easy to merge your patch, and your commit messages will show up in the trunk history attributed to you. > I'd like to take this opportunity to re-suggest doing the trunk merge > now so further development isn't forced to stand still while we wait for > the 1.7.0 beta cycle to complete. I might give it a shot on my own and > see how messy it ends up being. > > I still think this is a bad idea :P. Like I said above, you can still do development. Just make a branch and do your work in the branch. When trunk is ready we can merge your branch into it. You can even push your branch to launchpad so that multiple people can work on it with you. Cheers, RJ > Sean > > <<--------------------------------------------------------------------------------->> > This E-Mail message has been scanned for viruses > and cleared by >>SmartMail<< from Smarter Technology, Inc. > <<--------------------------------------------------------------------------------->> > > ------------------------------------------------------------------------------ > Register Now & Save for Velocity, the Web Performance & Operations > Conference from O'Reilly Media. Velocity features a full day of > expert-led, hands-on workshops and two days of sessions from industry > leaders in dedicated Performance & Operations tracks. Use code vel09scf > and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf > _______________________________________________ > Mixxx-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/mixxx-devel > ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf _______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
