[Systers-dev] A branch of our own?
Jennifer Redman
jenred at gmail.com
Fri Jun 4 10:56:53 PDT 2010
On Fri, Jun 4, 2010 at 10:38 AM, Anne Gunn <ompeag at wyoming.com> wrote:
> This may just be a Bazaar/Systers newbie question, so please feel free
> to give me a gentle RTFManual or RTFEmail answer if that is
> appropriate.
> Erica is currently making changes to the copy of the development branch
> that she pulled down to her local machine per the instructions
> at [1]http://systers.org/systers-dev/doku.php/using_launchpad and the
> launchpad/bazaar documentation.
> She should be committing locally whenever she has made a change that
> she wants to keep and, eventually, merge up into the development
> branch. (Erica, see the section labelled 'Making changes to your
> files' here:
> [2]http://doc.bazaar.canonical.com/latest/en/mini-tutorial/index.html)
> She is also producing fixes in the form of patches and contributing
> them to launchpad defect reports when appropriate.
> But, for Simone and I to stay synchronized with what Erica is doing in
> her local branch, should we be doing some sort of peer-to-peer
> commit/pull? Or should we make a branch of our own up in launchpad?
> The central branch up on launchpad seems the most natural to me since
> I'm an old centralized VCS hand. Also easier for the gatekeeper to use
> when it comes time to merge Erica's changes back up into the
> development/production branch.
> The peer-to-peer model seems possible
> ([3]http://doc.bazaar.canonical.com/latest/en/user-guide/partner_intro.
> html) but I'm not finding the detailed instructions about how you'd do
> that in a truly distributed (read: WAN/net) environment. If Erica's
> repository was on a lan with me, I'm sure I could figure out the
> command syntax to use to pull updates from her repository. But how do
> I do it across the net?
> Or am I missing the boat entirely and Erica should just be committing
> straight back into the Development branch when she has a change we are
> confident about?
> ag, TeamWishList
>
You are correct - we can create a TeamWishList. Working at this very moment
on getting the branches sorted out. Standby!
All GSoC students should be making regular commits to a branch on launchpad
so their code is available for review (I recommend daily even - since it
also serves as a good backup).
Suggestions very welcome for changes in the release process/branches.
Everyone - students and mentors should be members of the systers-dev
development group on launchpad.
Jen
To contribute to this conversation, send mail to <ompeag at wyoming.com>
More information about the Systers-dev
mailing list