From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Neil Jerram" Newsgroups: gmane.lisp.guile.devel Subject: Re: git and changelogs Date: Thu, 17 Jul 2008 22:29:09 +0100 Message-ID: <49dd78620807171429i19eb7e64x1a8ceb21d16e42fc@mail.gmail.com> References: <873aoanjcl.fsf@ambire.localdomain> <49dd78620807111522p61119440n3638f8cb6f69cddc@mail.gmail.com> <87r69twl9l.fsf@gnu.org> <49dd78620807171424r74f2ddfndf98ef08b6367961@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1216330552 31515 80.91.229.12 (17 Jul 2008 21:35:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Jul 2008 21:35:52 +0000 (UTC) Cc: guile-devel@gnu.org To: "=?ISO-8859-1?Q?Ludovic_Court=E8s?=" Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Thu Jul 17 23:36:39 2008 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.50) id 1KJb9R-0000ky-4c for guile-devel@m.gmane.org; Thu, 17 Jul 2008 23:36:37 +0200 Original-Received: from localhost ([127.0.0.1]:47464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJb8Y-0001Mj-JR for guile-devel@m.gmane.org; Thu, 17 Jul 2008 17:35:42 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KJb2G-0006tH-HD for guile-devel@gnu.org; Thu, 17 Jul 2008 17:29:12 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KJb2F-0006sz-Vl for guile-devel@gnu.org; Thu, 17 Jul 2008 17:29:12 -0400 Original-Received: from [199.232.76.173] (port=37667 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJb2F-0006ss-La for guile-devel@gnu.org; Thu, 17 Jul 2008 17:29:11 -0400 Original-Received: from yw-out-1718.google.com ([74.125.46.158]:7570) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KJb2F-00088F-JL for guile-devel@gnu.org; Thu, 17 Jul 2008 17:29:11 -0400 Original-Received: by yw-out-1718.google.com with SMTP id 9so2201ywk.66 for ; Thu, 17 Jul 2008 14:29:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=Ea5W/UDa6jZpOBAK8KDlRrDiS2+SD+nrixIWfhyqubo=; b=m178ebiABgmO1X7CWjC74BvIVTzat5beSww2BKQ55JBSZS0/0/rNRd1kdM4O6KxmOp Ql4xsO4OzzZBEqlsoYi/J4qXa0/akiJ/PYOcKn5glpkP2iOo1Luz3o5CAkEiTCgcfRt1 XmnJZB1cciTSmt5Cs1bDlVC9LmjeK3cllNgUE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=WknCfoIheHpmVh/vlXaLoE3bxUMi1MRaGe1v7f2UOSZ4Uy+j0xIrCnH/xzzoe9mw/T S3YB3eDiqEM4R5Q1usrhq3jf9DxnXoLOhsplkM9LkXPSafzUsrHbnDfRDwUIA2nCmbZ0 seDcYmxRE3se7gRVDLhVSY8OQgWsj70gl7DAs= Original-Received: by 10.114.210.2 with SMTP id i2mr2233590wag.18.1216330149722; Thu, 17 Jul 2008 14:29:09 -0700 (PDT) Original-Received: by 10.114.197.8 with HTTP; Thu, 17 Jul 2008 14:29:09 -0700 (PDT) In-Reply-To: <49dd78620807171424r74f2ddfndf98ef08b6367961@mail.gmail.com> Content-Disposition: inline X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) 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:7393 Archived-At: 2008/7/17 Neil Jerram : > 2008/7/16 Ludovic Court=E8s : >> >> Speaking of which, your latest commits did not include a ChangeLog >> entry. :-) > > Sorry, yes you're right. I was anticipating the abolition of > ChangeLogs, but prematurely. > > I've added the ChangeLogs in now, but I'm not sure I did the merge and > push correctly; can you take a look and advise? > > What I did was: > 1. Create 2 new commits in my own repo, with ChangeLogs for the two > previous commits. > 2. git pull > This caused conflicts, because you had an intervening commit that > modified ChangeLog and libguile/ChangeLog. > 3. Resolved those conflicts - in terms of the file contents. > 4. git add ChangeLog libguile/ChangeLog > 5. git merge > 6. git push > > Was that correct? (That was on branch_release-1-8. For master I did "git pull" first, which appears to have avoided some trouble.) Neil