Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Colin Childs (8c25b010228025db2954066f6e60dcd4891edf43)

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 master grimoire by Colin Childs (8c25b010228025db2954066f6e60dcd4891edf43)
  • Date: Fri, 11 May 2007 15:17:58 -0700

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Colin Childs wrote:
> GIT changes to master grimoire by Colin Childs <phoul AT sourcemage.org>:
>
> ChangeLog | 19 +++++++++++++++++++
<snip>
> New commits:
> commit 3b73111972709cd704e0fa624c04e82ba7147bbf
> Author: Colin Childs <phoul AT sourcemage.org>
> Commit: Colin Childs <phoul AT sourcemage.org>
>
> modified: ChangeLog
<snip>
> diff --git a/ChangeLog b/ChangeLog
> index 5e1647e..6add5c5 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,6 +1,25 @@
> +<<<<<<< HEAD:ChangeLog
> +2007-05-11 Colin "Phoul" Childs <phoul AT sourcemage.org>
> + * perl-cpan/acme-bleach: Modified DETAILS to include $PERL_CPAN_URL
> + * perl-cpan/algorithm-annotate: Modified DETAILS to include
> $PERL_CPAN_URL
> + * perl-cpan/algorithm-diff: Modified DETAILS to include $PERL_CPAN_URL
> + * perl-cpan/anyevent: Modified DETAILS to include $PERL_CPAN_URL
> + * perl-cpan/appconfig: Modified DETAILS to include $PERL_CPAN_URL
> + * perl-cpan/archive-tar: Modified DETAILS to include $PERL_CPAN_URL
> + * perl-cpan/archive-zip: Modified DETAILS to include $PERL_CPAN_URL
> + * perl-cpan/authen-pam: Modified DETAILS to include $PERL_CPAN_URL
> + * perl-cpan/authen-sasl: Modified DETAILS to include $PERL_CPAN_URL
> + * perl-cpan/digest: Modified DETAILS to include $PERL_CPAN_URL
> + * perl-cpan/anyevent: Upgraded to version 2.52
> + * perl-cpan/appconfig: Upgraded to version 1.64
> +
> +2007-05-11 Colin Childs <phoul AT sourcemage.org>
> + *added DEPENDS: xmms2 BOOST to nyello spell.
> +=======
> 2007-05-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
> * libcompat: added PERL_CPAN_URL fallback as that's not in
> stable sorcery yet but spells and quill already use it
> +>>>>>>> d7b2b6655e1af4c2ace11c685c33a2a4eb46a45f:ChangeLog
>
> 2007-05-11 Colin Childs <phoul AT sourcemage.org>
> Cleaned up the history & Depends files for
<snip>

Those conflict markers (<<<<, ===, >>>>) need to be taken care of (not
just removed, but the conflict resolved). git will tell you when there
is a conflict, then you edit the conflicting file and manually merge it
to look as it should. After that, run `git update-index <filename>` and
you may commit.

- -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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGROuWHXt9dKjv3WERAnZFAKCw934Ptd8DvtVtGq7B9M0qR8IWaQCfYRV4
62+UoCiu1dV/eR7wQo2IpAA=
=9Jzw
-----END PGP SIGNATURE-----




Archive powered by MHonArc 2.6.24.

Top of Page