[Scummvm-devel] Towards a new release branch model

[Arnaud Boutonné]

Hi everybody,

I'd like to answer (a bit late) to Fuzzie's call for feedback.

We decided to move to git despite we know it was more complex (which also
means in this case more powerful) than SVN and not-so-well supported under
Windows (and AmigaOS). I spent 3 or 4 days to configure it (full time, it
was hell), then I had minimum 1 crash per day (with a record of 8 crashes).
As I'm, afaik, the only one suffering of so many problems, I guess the
problem was my laptop.

Now, after "some" commits, I must also admit it's not a problem to use git
under Windows. In the meantime, my laptop died, and it took only an hour or
so to have a working environment (using gitExtension) on the new one.

Speaking of frustration, I think we must ensure that no potential new dev is
stucked during days on the configuration of git, else we may lose resources.
And I also think that we have enough helpful people here to avoid that, so,
again, it shouldn't be a problem.

Concerning the new release branch model, I have no particular opinion, they
look efficient and I see no critical point that could make me instantly like
one more than the other.


Best regards,
Arnaud


On Tue, May 31, 2011 at 6:43 PM, A. Milburn <fuzzie at users.sourceforge.net>wrote:

> On Tue, May 31, 2011 at 06:20:11PM +0200, Miguel Bernabeu wrote:
> > not). At the same time we are working in new stuff on "master" _but_not_
> > bugfixing "master". Now we rebase "stable" changes onto "master", so the
> > quick fix is applied to "master" and a thorough fix can be applied later,
> > without reverting the quick fix, simply a modifying commit.
>
> I worry that this is rather unrealistic given the nature of a lot of the
> quick
> fixes which get applied to stable branches - they're the *wrong* fix and
> people are going to want to revert them right away. As well as the
> situation
> with fixes which are irrelevant/wrong for master because other code changed
> and/or was refactored from underneath them.
>
> But I am generally concerned about the fact that various people have
> obviously been struggling with git since the move, and the possibility that
> - even without feature branches etc - mandating a development model like
> this
> will make people more frustrated with it and less motivated to actually fix
> things. Would be nice to have some feedback from such developers, to know
> if
> I'm just imagining things or not..
>
> - fuzzie
>
>
> ------------------------------------------------------------------------------
> Simplify data backup and recovery for your virtual environment with
> vRanger.
> Installation's a snap, and flexible recovery options mean your data is
> safe,
> secure and there when you need it. Data protection magic?
> Nope - It's vRanger. Get your free trial download today.
> http://p.sf.net/sfu/quest-sfdev2dev
> _______________________________________________
> Scummvm-devel mailing list
> Scummvm-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.scummvm.org/pipermail/scummvm-devel/attachments/20110601/2a4a457f/attachment.html>