[IPython-dev] Quick launchpad guide for would-be contributors
Ville M. Vainio
vivainio at gmail.com
Tue Jun 3 15:16:49 EDT 2008
On Tue, Jun 3, 2008 at 9:37 PM, Fernando Perez <fperez.net at gmail.com> wrote:
> One more thing: in here, the workflow you describe will lead to the
> 'history folding' problem we were having, no? You don't indicate
> keeping the dual-branch approach we'd discussed before and that I put
> in the version of the guide I uploaded over the weekend.
That is correct. This is guide for people who do not have push access
to the trunk, but rather will create a small branch to be integrated
to the trunk. People pushing to the trunk have different
responsibilities. This is rather a guide to get started with
launchpad, not ipython workflow as such.
> But I do want to clarify (simply because *I* am not 100% sure what the
> right solution is) if the dual-branch approach advocated earlier is
> correct, necessary, useful, etc.
Yes, it is necessary and useful; though with a slight clarification:
the main idea in keeping safe is to prefer pull instead of merge.
Basically, you should not do merges to "remain up to date", pull is
for that. merge should be used to move your own changes to the trunk,
not to get other people's stuff as with "svn up" (unless you are sure
your change actually needs other people's modifications as well).
Ville M. Vainio - vivainio.googlepages.com
blog=360.yahoo.com/villevainio - g[mail | talk]='vivainio'
More information about the IPython-dev