From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.devel Subject: Re: PROPOSAL: Move to git, now that bzr is no longer a req. Date: Fri, 03 Jan 2014 11:08:01 +0100 Message-ID: <871u0p8jjy.fsf@thinkpad.tsdh.org> References: <20140102095347.6834E381D0C@snark.thyrsus.com> <87fvp6bdd9.fsf_-_@ktab.red-bean.com> <8761q1ljny.fsf@gmail.com> <87lhyxqztz.fsf@gmx.de> <87vby1a0hf.fsf@bzg.ath.cx> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1388743697 29355 80.91.229.3 (3 Jan 2014 10:08:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Jan 2014 10:08:17 +0000 (UTC) Cc: Thierry Volpiatto , Michael Albinus , emacs-devel@gnu.org To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 03 11:08:23 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 1Vz1fz-0004uH-2Z for ged-emacs-devel@m.gmane.org; Fri, 03 Jan 2014 11:08:23 +0100 Original-Received: from localhost ([::1]:48946 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz1fy-0000oc-Jc for ged-emacs-devel@m.gmane.org; Fri, 03 Jan 2014 05:08:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz1fq-0000oH-MG for emacs-devel@gnu.org; Fri, 03 Jan 2014 05:08:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vz1fl-00032c-CK for emacs-devel@gnu.org; Fri, 03 Jan 2014 05:08:14 -0500 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:45310) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz1ff-000324-Ff; Fri, 03 Jan 2014 05:08:03 -0500 Original-Received: from compute4.internal (compute4.nyi.mail.srv.osa [10.202.2.44]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 3FCFE209F4; Fri, 3 Jan 2014 05:08:03 -0500 (EST) Original-Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Fri, 03 Jan 2014 05:08:03 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:references:date :in-reply-to:message-id:mime-version:content-type; s=smtpout; bh=iTeh58CzaxaLj/yz4erqRRkSNVs=; b=H3mpoRHBNhtdKBsYHGSQt9zbY4+7 0Z2SGsnPcaytIsf07YwpHJOSR/yJUK+FO2RlhkRmsHtQWcgP8lea7WnuSO1zdmkj P5xYM8Gin/aZnd8YVyrO2DrrD+cr5wqxD4JHW4hmoTOwQsBHfO4KL5t1kbNFVa6w IVSfH+LH+8vWlHY= X-Sasl-enc: QOGsJZALELyA1rksY44xP7b2X0kPEBLmHZ0N6iE8n23m 1388743682 Original-Received: from thinkpad.tsdh.org (unknown [91.67.164.26]) by mail.messagingengine.com (Postfix) with ESMTPA id 6B31868025B; Fri, 3 Jan 2014 05:08:02 -0500 (EST) Mail-Followup-To: Bastien , Michael Albinus , emacs-devel@gnu.org, Thierry Volpiatto In-Reply-To: <87vby1a0hf.fsf@bzg.ath.cx> (Bastien's message of "Fri, 03 Jan 2014 10:17:00 +0100") User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.111.4.27 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:167137 Archived-At: Bastien writes: >> Another question is, whether we still want to write ChangeLogs >> manually, or whether we want to extract them from commit comments. >> That's not such easy, see all the "fix typo" comments. > > I'm all for writing them manually, it's a useful exercise. The problem with ChangeLog files is that they provoke conflicts. When I contribute to some git-using project that has manually written ChangeLog files, I usually create a new branch, do my changes, write a ChangeLog entry in a _temporary_ buffer, and then commit providing a one-line description plus the ChangeLog entries (without the author/date headline). Then I sometimes rebase that branch onto master (which works just fine since the ChangeLog hasn't been changed) until upstream is satisfied with my changes. At that point, I put my commit message as real entry into the ChangeLog, commit, squash the ChangeLog commit with the commit implementing my changes, and finally push/submit the patch/send the pull request. That said, bzr with its changelog_merge plugin is nice, too. Then you can make a real, persistent ChangeLog entry along with your commit implementing the code changes, but once you merge your branch into trunk you have to remember to pull your entry to the top of the ChangeLog and re-date it. Bye, Tassilo