Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (5fb52e1c96c616d209bb99c5897446a3b7dfbbec)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: flux <flux AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (5fb52e1c96c616d209bb99c5897446a3b7dfbbec)
  • Date: Tue, 5 Apr 2011 22:40:46 +0900

Ladislav Hagara (ladislav.hagara AT unob.cz) wrote [11.04.05 22:28]:
> > Unfortunately, this is another instance where our git email hooks have
> > gone awry. If you look at the actual git repo, you'll see that there was
> > only one (real) commit (the other was a merge of the upstream master to
> > whatever branch he was committing from), with changes affecting only one
> > spell. I'm guessing maybe our hooks went screwy because they thought the
> > merge commit correspond to a merge of upstream branches?
>
>
> I am still git novice but this [1] doesn't seems to change only one
> spell. DETAILS files are chnaged in master. HISTORY are missing. Seems
> firefox with xulrunner are also updated. It doesn't look they have been
> integrated from devel-firefox4 [2].
>
> It is very difficult and time demanding to review this kind of changes.
>
> [1]
> http://scmweb.sourcemage.org/gitweb.cgi?p=smgl/grimoire.git;a=commitdiff;h=c5e7eeacf7c27c53866d58ea201c14823df24db1;hp=693d9da6b042cbbd07f409adf264f0216eedeff9
>
>
> [2]
> http://scmweb.sourcemage.org/gitweb.cgi?p=smgl/grimoire.git;a=shortlog;h=refs/heads/devel-firefox4

I didn't look via our gitweb, I did git log -p in the actual repo
locally after making sure (several times) that I was up-to-date. I'll
try to do some more investigation later if I have time.

--
Justin "flux_control" Boffemmyer
Cauldron wizard and general mage
Source Mage GNU/Linux
http://www.sourcemage.org

Attachment: pgpNBpTIlDt0a.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page