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:24:05 +0100 Message-ID: <49dd78620807171424r74f2ddfndf98ef08b6367961@mail.gmail.com> References: <873aoanjcl.fsf@ambire.localdomain> <49dd78620807111522p61119440n3638f8cb6f69cddc@mail.gmail.com> <87r69twl9l.fsf@gnu.org> 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 1216329948 29596 80.91.229.12 (17 Jul 2008 21:25:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Jul 2008 21:25:48 +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:26:36 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 1KJazi-0005zb-HH for guile-devel@m.gmane.org; Thu, 17 Jul 2008 23:26:35 +0200 Original-Received: from localhost ([127.0.0.1]:33146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJayp-0005JO-CM for guile-devel@m.gmane.org; Thu, 17 Jul 2008 17:25:39 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KJaxO-0004qg-6m for guile-devel@gnu.org; Thu, 17 Jul 2008 17:24:10 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KJaxN-0004qH-GS for guile-devel@gnu.org; Thu, 17 Jul 2008 17:24:09 -0400 Original-Received: from [199.232.76.173] (port=34864 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJaxN-0004qA-Ba for guile-devel@gnu.org; Thu, 17 Jul 2008 17:24:09 -0400 Original-Received: from yx-out-1718.google.com ([74.125.44.152]:35408) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KJaxN-0006kk-0v for guile-devel@gnu.org; Thu, 17 Jul 2008 17:24:09 -0400 Original-Received: by yx-out-1718.google.com with SMTP id 34so20587yxf.66 for ; Thu, 17 Jul 2008 14:24:06 -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=NHA+veSKRGlQeeKXOEv8Q3nGGrmRvpVj9tdTTixMph0=; b=Hdjg3qWB8xXMLoiXFN1Y4PkJrspk+u31Pelz5KOyd/9vhpa/fWKZfQ+U1+0DpObQVP J7znnDLCztKHrqwN4FDJkAUBFoXCDkEHS3nicvmPzsvmFdnXHR5z5S021Zj4cp+aWtCL n4IY6qGYNzeM7vLLxVQGxYassLDGAFKriWrV8= 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=MVUZpzP/fjl0RPD94U7Zn3/OZWKgGTOcsLjlGyeCS6YGEZYcYjG3QqZknEvy/mE5GJ dBn9Nq7LUSluni3SyJduNhyWYDdY68RHZMl6eO43FzMApb9nIzlgOuWDxB2j3Klyxt4h xvsZAIGApmxnoC6qpWhqnjFS6eupULnARGkdA= Original-Received: by 10.114.144.1 with SMTP id r1mr2182782wad.97.1216329845347; Thu, 17 Jul 2008 14:24:05 -0700 (PDT) Original-Received: by 10.114.197.8 with HTTP; Thu, 17 Jul 2008 14:24:05 -0700 (PDT) In-Reply-To: <87r69twl9l.fsf@gnu.org> 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:7392 Archived-At: 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? Thanks, Neil