On 07/03/2011 01:03 AM, Jacques Le Roux wrote:
From: "Adam Heath" <[email protected]>
On 07/01/2011 01:43 AM, Jacques Le Roux wrote:
Hi Adam,
I just finished to review your recent commits, parallel stuff looks
promising. Do you intend to backport the "FIX:" ?
Thank's for the reviews. Yes, we probably should backport the fixes.
Most of those were developed on 902021(which has other fixes and
features, it's what we are currently using at brainfood).
Will you handle it?
Yeah. I'm just reworking mergefromtrunk.sh to support git in a much
nicer way. I can use the same set of cmdline args(to that script),
but instead of directly committing, it'll queue up in git. Then, I
can test all the changes one after the other in a loop(using git
rebase). Then commit all at once.
Currently, I have to merge, run the test, then commit, and that takes
me more time. Whereas with my new way, I can use a block of time just
for the merging(and fixing any conflicts), then walk away from it
while all the tests run on each change.
