← Back to team overview

genesis-devs team mailing list archive

Re: About 0.4.2-fixes branch

 

Hi!

> When working collaboratively on the same branch, I guess we should
> switch to using an svn-like centralised approach? `push` doesn’t handle
> merging, so using `bind` and `ci` should be better?

It wasn't my intention to replace our current branch-merge workflow.
But sometimes would be useful to have some agility to establish
baselines or code reviews.

> Anyway, I’d recommend working on separate branches for new features. We
> could agree on few shared branches, like `trunk` and `0.5` that we both
> can merge completed work into. So e.g.:
>
>      * You work on `account-management`, and I won’t add anything to
>        that branch.
>      * In the meanwhile, I work on, say, `new-actions` (for the error
>        icons etc.).
>      * Once we’re done with our work, we both can merge into the `0.5`
>        branch.

I agree, that was my intention. But sometimes a branch depends in
another, and in that case we need more flexibility to merge, commit or
establish baselines in "master" branches. But at least in my case, I
would try to ask always for a code review before requesting a merge.
Eternal pain for all of them who breaks trunk :-P

> I just have few minor questions:
>
>      * Why did you add `genesis.pot` to `locale/templates`? It used to
>        be unter `po`. Has this a specific advantage? I think the
>        update_translations script relies on the po template to be in
>        the po directory.

I had no idea, I didn't find that file anywhere, neither that script
:-S. I thought it would be a good idea to add it to the source code
distribution, for those who download the source from launchpad but
doesn't have an account, or doesn't know how lp works.

But feel free to remove it or change its location, without problem :-)

>      * Is it necessary to use that complicated
>        subprocess.Popen().communicate()[0] construct in setup.py? Isn’t
>        a simple subprocess.call() sufficient?

To be honest, I've found that code snippet in google.com/codesearch.
It seems to work and I didn't think in refactoring it, firstly because
I'm lazy and I had little experience with thread management in Python
:-S, I'm sorry.

Please take a look at it, and perform all the changes you consider
necessary. Sorry for the inconvenience that I may have caused.
Currently I'm very busy, but the following weekend I'll try to take a
look at it :-S

Happy Christmas!!



Follow ups

References