Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to stable-0.4 grimoire by Arwed v. Merkatz (e01377777be80d5a677d65cfab0a6de14e2b7a0d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to stable-0.4 grimoire by Arwed v. Merkatz (e01377777be80d5a677d65cfab0a6de14e2b7a0d)
  • Date: Wed, 19 Jul 2006 21:59:30 +0200

On Wed, Jul 19, 2006 at 10:21:33AM -0500, Jeremy Blosser wrote:
[...]
> > > diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
> > > index e97134a..e4177dc 100755
> > > --- a/video-libs/xine-lib/DETAILS
> > > +++ b/video-libs/xine-lib/DETAILS
> > > @@ -1,14 +1,16 @@
> > > SPELL=xine-lib
> > > - VERSION=1.1.1
> > > - SOURCE=$SPELL-$VERSION.tar.gz
> > > + VERSION=1.1.2
> > > + SOURCE=$SPELL-$VERSION.tar.bz2
> > > SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
> > > SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
> > > WEB_SITE=http://xine.sourceforge.net
> > > ENTERED=20010927
> > > - UPDATED=20051024
> > > SOURCE_HASH=sha512:cb669a0b9ca4e3c5d4c4c8b156e26dab0a1dc0b48a5d73727f2d53a437560170820d81c6fd2a5ead21361eb645bda8e5c97017a6cf0019f70b0761b935cc4df1
> > > +
> > > SOURCE_HASH=sha512:ae736be0a23a865652e0eb1d33af649c7d9ff992b2d6a67e59448fb3d43a2bba3a51f98d2d596b7473e88b348e0b7e43f1ad2369c287304a1fed1a5f79b2f7a1
> >
> > Now we have SOURCE_HASH twice in DETAILS.
> > http://distro.ibiblio.org/pub/linux/distributions/sourcemage/codex/stable/video-libs/xine-lib/DETAILS
> > Is it git feature? :-)
>
> Hrm, the original commit you did didn't show an UPDATED line still in the
> file, maybe Arwed had to resolve a conflict and deleted the wrong line
> manually?

Yes, for stable grimoire I only cherry-picked the update, not the
changes in-between and just missed that while resolving.

> http://scmweb.sourcemage.org/gitweb.cgi?p=smgl/grimoire.git;a=commitdiff;h=6c6bcb0793a90336d197c0092fa0e51715c95386;hp=8fbea9dba05f9bb283d49dca61061d4e96a84d6b
>
> > Sorry for this question, I am really annoyed with git.
> > Wonder if somebody really read sm-commits,
> > https://lists.ibiblio.org/sympa/arc/sm-commit/2006-July/004776.html
>
> You got a couple of replies...



> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit


--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org




Archive powered by MHonArc 2.6.24.

Top of Page