Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Maurizio Boriani (e568ffd78bad806012fdd30a8f87fd34587c6023)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andrew Stitt <afrayedknot AT thefrayedknot.armory.com>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Maurizio Boriani (e568ffd78bad806012fdd30a8f87fd34587c6023)
  • Date: Mon, 9 Oct 2006 08:57:14 -0700

Yet more bad merges.

I say we give him 24 hours and back these out ourselves. He can try
again later after practicing updating once or twice. Its pretty obvious
he just kept trying git commands until something worked and didn't read
or follow the guide.

-Andrew

On Mon, Oct 09, 2006 at 10:46:32AM -0500, Maurizio Boriani wrote:
> GIT changes to master grimoire by Maurizio Boriani <baux AT sourcemage.org>:
> diff --git a/gnustep-apps/gnustep-terminal/HISTORY
> b/gnustep-apps/gnustep-terminal/HISTORY
> index 44a4562..2e4ef4b 100644
> --- a/gnustep-apps/gnustep-terminal/HISTORY
> +++ b/gnustep-apps/gnustep-terminal/HISTORY
> @@ -1,8 +1,5 @@
> -2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
> - * DETAILS: [automated] Removed UPDATED.
> -
> -2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
> - * DETAILS: [automated] Removed BUILD_API=2.
> +2006-10-09 Maurizio Boriani <baux AT sourcemage.org>
> + * BUILD: Fix dummy concatenate error.
>
> 2006-04-14 Maurizio Boriani <baux AT sourcemage.org>
> * Fix dummy concatenations bugs and others.
> diff --git a/gnustep-libs/gnustep-prefsmodule/BUILD
> b/gnustep-libs/gnustep-prefsmodule/BUILD
> index 43b0f52..6def23c 100755
> --- a/gnustep-libs/gnustep-prefsmodule/BUILD
> +++ b/gnustep-libs/gnustep-prefsmodule/BUILD
> @@ -11,4 +11,4 @@ cd Frameworks/PrefsModule
>
> make &&
>
> -cd ../../ &&
> +cd ../../
> diff --git a/gnustep-libs/gnustep-prefsmodule/HISTORY
> b/gnustep-libs/gnustep-prefsmodule/HISTORY
> index e4f8ad8..a8a0021 100644
> --- a/gnustep-libs/gnustep-prefsmodule/HISTORY
> +++ b/gnustep-libs/gnustep-prefsmodule/HISTORY
> @@ -1,8 +1,5 @@
> -2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
> - * DETAILS: [automated] Removed UPDATED.
> -
> -2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
> - * DETAILS: [automated] Removed BUILD_API=2.
> +2006-10-09 Maurizio Boriani <baux AT sourcemage.org>
> + * BUILD: Fix dummy error.
>
> 2006-04-14 Maurizio Boriani <baux AT sourcemage.org>
> * Fix dummy concatenations bugs.
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit




Archive powered by MHonArc 2.6.24.

Top of Page