From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thien-Thi Nguyen Newsgroups: gmane.lisp.guile.devel Subject: Re: git push weird? Date: Tue, 15 Jun 2010 21:39:11 +0200 Message-ID: <871vc8nl0g.fsf@ambire.localdomain> References: <87fx0ozfx1.fsf@ambire.localdomain> <87sk4onmzw.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1276630903 10043 80.91.229.12 (15 Jun 2010 19:41:43 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 15 Jun 2010 19:41:43 +0000 (UTC) Cc: guile-devel@gnu.org To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Tue Jun 15 21:41:42 2010 connect(): No such file or directory Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OOc0z-0008HA-08 for guile-devel@m.gmane.org; Tue, 15 Jun 2010 21:41:41 +0200 Original-Received: from localhost ([127.0.0.1]:54959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOc0y-0001KR-JM for guile-devel@m.gmane.org; Tue, 15 Jun 2010 15:41:40 -0400 Original-Received: from [140.186.70.92] (port=34123 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOc0q-0001KG-P7 for guile-devel@gnu.org; Tue, 15 Jun 2010 15:41:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOc0p-0001Xy-Ef for guile-devel@gnu.org; Tue, 15 Jun 2010 15:41:32 -0400 Original-Received: from smtp207.alice.it ([82.57.200.103]:58391) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOc0m-0001XF-CJ; Tue, 15 Jun 2010 15:41:28 -0400 Original-Received: from ambire.localdomain (95.244.64.180) by smtp207.alice.it (8.5.124.05) id 4C0E61DE0074AC14; Tue, 15 Jun 2010 21:41:26 +0200 Original-Received: from ttn by ambire.localdomain with local (Exim 4.69) (envelope-from ) id 1OObyZ-0005zZ-AH; Tue, 15 Jun 2010 21:39:11 +0200 In-Reply-To: <87sk4onmzw.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Tue, 15 Jun 2010 20:56:19 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:10486 Archived-At: () ludo@gnu.org (Ludovic Court=C3=A8s) () Tue, 15 Jun 2010 20:56:19 +0200 These are =E2=80=9Cmerge commits=E2=80=9D. Please avoid pushing any mer= ge commits as they make the history non-linear for no reason in such situations. See =E2=80=98git rebase=E2=80=99 and the like for how to avoid it. OK. Besides, did you mean to push to =E2=80=98master=E2=80=99? Yes, but now i believe that that was fuzzy thinking, not to mention in disregard of my agreement to not do so made several months ago (which i didn't remember until just after pressing RET -- sigh). :-( I will push only to ttn/* henceforth. Could you please undo the damage on =E2=80=98master=E2=80=99? FWIW, the commit edb3cfc37de8c216e3b1c06970ef39e3638560be, aka "[maint] Add configure.ac abstraction: GUILE_CONFIG_SCRIPT", is ready for review. The other commit 0faca15c33cfbe1ef25fd6b4bbc7f92b57659345, aka "Init shell var properly in git-version-gen", is functional, and would also be ready for review, were it not my belief that the change should actually be effected by import from upstream (gnulib). Am i missing something? That's the commit i wanted to omit. thi