Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to devel grimoire by Jaka Kranjc (bee32eb5e63a32923ba6f25fe390d1aef77d61f9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <eric AT sandall.us>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to devel grimoire by Jaka Kranjc (bee32eb5e63a32923ba6f25fe390d1aef77d61f9)
  • Date: Fri, 18 May 2007 13:49:24 -0700

Arwed von Merkatz wrote:
> On Fri, May 18, 2007 at 09:31:18PM +0200, Arwed von Merkatz wrote:
>> On Fri, May 18, 2007 at 12:38:32PM -0500, Jaka Kranjc wrote:
>>> GIT changes to devel grimoire by Jaka Kranjc
>>> <lynxlynxlynx AT sourcemage.org>:
>>>
>>> gnu/objc/DETAILS | 2 +-
>>> gnu/objc/HISTORY | 3 +++
>>> 2 files changed, 4 insertions(+), 1 deletion(-)
>>>
>>> New commits:
>>> commit bee32eb5e63a32923ba6f25fe390d1aef77d61f9
>>> Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
>>> Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
>>>
>>> objc: 4.2.0
>> I think those gcc changes should be pushed in a single push, seperate
>> commits. Otherwise, you get inconsistent states in the grimoire. E.g.
>> right now the ada spell is broken, as an installed compiler doesn't
>> work and you can't recast it.
>> As long as this is just in git, it's not that big a problem, but the
>> test tarball gets regenerated regularly, and if it hits some point where
>> half of the compilers are updated, it _is_ a problem for the users
>> updating at that time.
>
> Nevermind, I overlooked the fact that you're submitting these to the
> devel grimoire. Mostly because I forgot that such a thing as a full
> devel grimoire still exists in git.
> Imho, we should get rid of it, it only makes merging those changes more
> complicated. Seperate devel-* branches for sets of features make a lot
> more sense. Those branches can easily be merged into test grimoire
> independently, while with a full scale devel grimoire, you have to
> cherry-pick each commit by hand when merging.

I agree. People who wish to work on stuff outside of test may make their
own, local branches. If they wish to collaborate they can make a
devel-<project> branch and push it to the server.

The only issue, I believe, with removing our current devel is work
exists in it which needs to be moved to separate devel-<project>
branches before devel itself can be removed.

-sandalle

--
Eric Sandall | Source Mage GNU/Linux Developer
eric AT sandall.us PGP: 0xA8EFDD61 | http://www.sourcemage.org/
http://eric.sandall.us/ | http://counter.li.org/ #196285

Attachment: signature.asc
Description: OpenPGP digital signature




Archive powered by MHonArc 2.6.24.

Top of Page