genesis-devs team mailing list archive
-
genesis-devs team
-
Mailing list archive
-
Message #00033
Re: About 0.4.2-fixes branch
Hi!
I’m just about to merge the 0.4.2-fixes branch.
Am Mittwoch, den 16.12.2009, 11:58 +0100 schrieb David Castellanos:
> A few quick things:
> - I had no idea that branches ownership could be changed, and last
> week I realized. I changed the ownership of all my genesis-related
> branches to genesis-devs. This way we can push changes in the branch
> both you and me. The drawback is that some branch URL has changed,
> from lp:~davidcaste/XXX to lp:~/genesis-devs/XXX
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?
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've prepared the branch lp:~genesis-devs/genesis-sync/0.4.2-fixes
> with bugfixes for Genesis 0.4.2.1. I think it's ready because this
> morning I've added support for arbitrary prefixes in setup.py install
> method. Please take a look at it, and if you think that everything is
> alright, we can merge it into trunk and release a beta package of
> Genesis 0.4.3, for example.
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.
* Is it necessary to use that complicated
subprocess.Popen().communicate()[0] construct in setup.py? Isn’t
a simple subprocess.call() sufficient?
> - The last thing is that I've created a new branch and registered the
> Genesis 0.5.X series. I really prefer to have two separate branches,
> one for 0.4 series and another for 0.5 series, because the development
> of 0.5 will last a little, and if more bugs appears in 0.4 series we
> could fix them, and release even another Genesis 0.4 revision. I
> didn't push anything into 0.5 series branch because I've been waiting
> the 0.4.2-fixes branch to be merged into trunk (or 0.4 series). Then
> I'll push 0.4 series contents into 0.5 series branch, and I would
> start working in 0.5 series.
Yes, that’s good.
Cheers,
Frederik
Follow ups
References