From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: State of the repository conversion Date: Thu, 20 Mar 2014 22:10:01 +0100 Organization: Probably a good idea Message-ID: <8738ic4lw6.fsf@dod.no> References: <20140319175124.BCCB3380835@snark.thyrsus.com> <83wqfq82ge.fsf@gnu.org> <20140319185416.GA25588@thyrsus.com> <83siqe80bj.fsf@gnu.org> <87siqdiven.fsf@uwakimon.sk.tsukuba.ac.jp> <83ior98qi4.fsf@gnu.org> <87lhw5qyx9.fsf@wanadoo.es> <83a9ck970z.fsf@gnu.org> <87ha6s4npk.fsf@dod.no> <83d2hg7gge.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1395349818 15451 80.91.229.3 (20 Mar 2014 21:10:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Mar 2014 21:10:18 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 20 22:10:27 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 1WQkEM-0000oj-4G for ged-emacs-devel@m.gmane.org; Thu, 20 Mar 2014 22:10:26 +0100 Original-Received: from localhost ([::1]:49416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQkEL-00037d-Kg for ged-emacs-devel@m.gmane.org; Thu, 20 Mar 2014 17:10:25 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQkEF-00030S-Ag for emacs-devel@gnu.org; Thu, 20 Mar 2014 17:10:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQkE9-0007HU-Gt for emacs-devel@gnu.org; Thu, 20 Mar 2014 17:10:19 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:47330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQkE9-0007EL-AN for emacs-devel@gnu.org; Thu, 20 Mar 2014 17:10:13 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1WQkE7-0000Ur-K6 for emacs-devel@gnu.org; Thu, 20 Mar 2014 22:10:11 +0100 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 20 Mar 2014 22:10:11 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 20 Mar 2014 22:10:11 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 17 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3 (gnu/linux) Cancel-Lock: sha1:EUVT7cHtaHI7dbfPA3OVX4OUCzw= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:170678 Archived-At: >>>>> Eli Zaretskii : > Why is it more natural? If the same bug exists on the trunk, you > could fix it in either of the two places first. I live in the land of refactoring, and one thing that happens immediately after a branch for release, is that people tend to go wild with refactoring that has been delayed pending the release. So it makes most sense to look for the bug where it has been reported. As for merging the fix into master: the master may have changed so much that the fix doesn't make sense anymore. That said, a merge has a better change at finding the correct place to apply, in the refactoried code, than a cherry-pick does. But the merge result needs to be inspected after the merge.