From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: ludo@gnu.org (Ludovic =?iso-8859-1?Q?Court=E8s?=) Newsgroups: gmane.lisp.guile.devel Subject: Re: git and changelogs Date: Fri, 18 Jul 2008 15:05:03 +0200 Message-ID: <87fxq78hs0.fsf@gnu.org> 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=us-ascii X-Trace: ger.gmane.org 1216386373 15246 80.91.229.12 (18 Jul 2008 13:06:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 18 Jul 2008 13:06:13 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Fri Jul 18 15:07:01 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 1KJpff-0003Wz-Sv for guile-devel@m.gmane.org; Fri, 18 Jul 2008 15:06:52 +0200 Original-Received: from localhost ([127.0.0.1]:58014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJpem-0008UX-5n for guile-devel@m.gmane.org; Fri, 18 Jul 2008 09:05:56 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KJpeC-0008TC-TX for guile-devel@gnu.org; Fri, 18 Jul 2008 09:05:21 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KJpe9-0008PP-FO for guile-devel@gnu.org; Fri, 18 Jul 2008 09:05:19 -0400 Original-Received: from [199.232.76.173] (port=44720 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJpe9-0008P6-3N for guile-devel@gnu.org; Fri, 18 Jul 2008 09:05:17 -0400 Original-Received: from main.gmane.org ([80.91.229.2]:54941 helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KJpe8-0000pe-JG for guile-devel@gnu.org; Fri, 18 Jul 2008 09:05:16 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1KJpe1-00056G-Uw for guile-devel@gnu.org; Fri, 18 Jul 2008 13:05:09 +0000 Original-Received: from 193.50.110.140 ([193.50.110.140]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 18 Jul 2008 13:05:09 +0000 Original-Received: from ludo by 193.50.110.140 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 18 Jul 2008 13:05:09 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 35 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 193.50.110.140 X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 1 Thermidor an 216 de la =?iso-8859-1?Q?R=E9volution?= X-PGP-Key-ID: 0xEA52ECF4 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 821D 815D 902A 7EAB 5CEE D120 7FBA 3D4F EB1F 5364 X-OS: i686-pc-linux-gnu User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) Cancel-Lock: sha1:sTTO6PRtcScamPkJq2qSMU98nzw= X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) 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:7396 Archived-At: Hi, "Neil Jerram" writes: > Sorry, yes you're right. I was anticipating the abolition of > ChangeLogs, but prematurely. Eh. ;-) Eventually, at some point, we'll abolish them for real. > 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? That looks OK. > 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 I'd have done a "git-commit -c ORIGINAL-COMMIT-ID" after step 4 and no "git merge", but it looks like there's more than one way to do it. Now, the issue with merges is that they make the history look more complex than needed (see with gitk, for instance). Thus, it's usually best to write ChangeLog entries at the very last minute, after running `git-pull'. Another reason to abolish ChangeLogs... Thanks, Ludovic.