From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: PROPOSAL: Move to git, now that bzr is no longer a req. Date: Sat, 04 Jan 2014 13:58:18 +0100 Message-ID: <87d2k7x5sl.fsf@bzg.ath.cx> References: <20140102095347.6834E381D0C@snark.thyrsus.com> <87fvp6bdd9.fsf_-_@ktab.red-bean.com> <8761q1ljny.fsf@gmail.com> <87lhyxqztz.fsf@gmx.de> <87mwjct755.fsf@bzg.ath.cx> <87eh4n9ak6.fsf@Rainer.invalid> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1388840310 10366 80.91.229.3 (4 Jan 2014 12:58:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Jan 2014 12:58:30 +0000 (UTC) Cc: emacs-devel@gnu.org To: Achim Gratz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 04 13:58:37 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VzQoE-0004PU-UB for ged-emacs-devel@m.gmane.org; Sat, 04 Jan 2014 13:58:35 +0100 Original-Received: from localhost ([::1]:54207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzQoE-0001hs-JY for ged-emacs-devel@m.gmane.org; Sat, 04 Jan 2014 07:58:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzQo7-0001hd-HD for emacs-devel@gnu.org; Sat, 04 Jan 2014 07:58:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VzQo2-0005BB-Sq for emacs-devel@gnu.org; Sat, 04 Jan 2014 07:58:27 -0500 Original-Received: from mail-we0-x22f.google.com ([2a00:1450:400c:c03::22f]:43962) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzQo2-0005B7-MS for emacs-devel@gnu.org; Sat, 04 Jan 2014 07:58:22 -0500 Original-Received: by mail-we0-f175.google.com with SMTP id t60so14125421wes.6 for ; Sat, 04 Jan 2014 04:58:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=GiU6z4MWKlO+bCSL6qtaYqesdKbXG7Okkb0DqdsyR+s=; b=zMDjzimoLPlEOGQu2SWQYY5YtIEQq57FrxbqN7Q/Y9bSY7kO08AZHQOIjFcYRh4o7J qYABP0KVhawplCSS1/Rpyi/GmxyXmLoavnfiHbo96A748z620njaXdipHqGbrC2E4pbT fMiHH2D7ci/LhxQETkk6xIvMUQKl1+5yhNW2Dfd09oMaUsprAYS6c0vppumgjuM/l4gT DiZtILNww4zP5omumdyn/Zhs4vEp7fT5qJmyD0b0LJpa82eWywFa4Hvjm+5EZ6gMxAUA 5JLd+F9XjTXmhVa7xVAqIaC8NnK2eDU8ZizJwyMSVX6QY1W/QDeCzwhu9k8GmVZApgIC G6og== X-Received: by 10.180.95.162 with SMTP id dl2mr5588714wib.17.1388840301657; Sat, 04 Jan 2014 04:58:21 -0800 (PST) Original-Received: from bzg.localdomain (mar75-2-81-56-68-112.fbx.proxad.net. [81.56.68.112]) by mx.google.com with ESMTPSA id ey3sm7542272wib.4.2014.01.04.04.58.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Jan 2014 04:58:20 -0800 (PST) Original-Received: by bzg.localdomain (Postfix, from userid 1000) id 3F9EB1C2063E; Sat, 4 Jan 2014 13:58:18 +0100 (CET) In-Reply-To: <87eh4n9ak6.fsf@Rainer.invalid> (Achim Gratz's message of "Sat, 04 Jan 2014 13:49:13 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::22f X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:167277 Archived-At: Achim Gratz writes: > Bastien writes: >> How would we handle fixing in such generated logs? > > The same way we do today if we only care about the Changelog file. We don't do "it" today. Org ChangeLogs are generated using a script, and these changelogs are added to Emacs when we merge Org. It's fine fixing these changelogs manually because newly generated Changelogs don't overwrite previous ones. My question is: if Emacs generates Changelogs from commit messages, and if commit messages contain ill-formated changelogs, how do you fix generated changelogs? One idea is to generate only new changes (and fix them manually if needed), not to generate all ChangeLogs. > Otherwise, we'd have to come up with something using Git notes (as > already mentioned earlier in this thread). > >> By revising the git history through rebasing? > > Nope. > >> Not a rhetorical question, just curious, as I do have a >> problem with the current way Org generates its ChangeLogs. > > For the benefit of other participants in this discussion you might > mention that Org doesn't have a ChangeLog I did: http://article.gmane.org/gmane.emacs.devel/167136 > and the only reason we > generate one is that when changes are imported into Emacs there is > suddenly a need to document that merge (typically produced by ~1000 > commits from Org) in Emacs' ChangeLog. Since that operation throws away > all history from Org, it also means you can't use the commit messages > directly for the ChangeLog, no matter how hard you'd wish you could. It's a matter of convention: if Emacs generates Changelog files from commit messages, I guess we will enforce some policy on how to write suitable commit messages. Additional (not suitable for ChangeLogs) information could then be stored in git notes. > That wouldn't necessarily be a problem in Emacs' case where the > correspondence between commit and ChangeLog would be 1:1. Yes. -- Bastien