From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Sun, 14 Dec 2014 11:37:49 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87tx0yxk4i.fsf@lifelogs.com> References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <87ppbquo97.fsf@gmail.com> <83zjaurreb.fsf@gnu.org> <874mt14wrc.fsf@lifelogs.com> <83egs5rzlr.fsf@gnu.org> <877fxx2e6t.fsf@lifelogs.com> <83a92trlgs.fsf@gnu.org> <87oar81jlp.fsf@lifelogs.com> <87bnn7rkcq.fsf@engster.org> <877fxvri96.fsf@engster.org> <87zjarznzs.fsf@lifelogs.com> <87sigjpri2.fsf@engster.org> <838uib60jv.fsf@gnu.org> <87mw6rpc6l.fsf@engster.org> <83sigj48z5.fsf@gnu.org> <874mszp2i7.fsf@engster.org> <83iohe43hu.fsf@gnu.org> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418575064 26791 80.91.229.3 (14 Dec 2014 16:37:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 14 Dec 2014 16:37:44 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 14 17:37:38 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 1Y0CAp-0006MY-Gk for ged-emacs-devel@m.gmane.org; Sun, 14 Dec 2014 17:37:35 +0100 Original-Received: from localhost ([::1]:36442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0CAo-0003gg-SX for ged-emacs-devel@m.gmane.org; Sun, 14 Dec 2014 11:37:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0CAW-0003gZ-EJ for emacs-devel@gnu.org; Sun, 14 Dec 2014 11:37:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0CAN-0004mi-Dk for emacs-devel@gnu.org; Sun, 14 Dec 2014 11:37:16 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:54786) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0CAN-0004mJ-6r for emacs-devel@gnu.org; Sun, 14 Dec 2014 11:37:07 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Y0CAI-0005Eo-BM for emacs-devel@gnu.org; Sun, 14 Dec 2014 17:37:02 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 14 Dec 2014 17:37:02 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 14 Dec 2014 17:37:02 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 22 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:gWEzXukyiqhvKGbL2FYkvslvGcw= 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:180091 Archived-At: On Sun, 14 Dec 2014 18:09:49 +0200 Eli Zaretskii wrote: EZ> If there is no better workflow, perhaps we need to radically rethink EZ> our recommended project workflow, like not base it on merges but on EZ> rebase, or push fixes to master and then cherry-pick them to the EZ> release branch, or something else. Because what bzr supported easily EZ> and almost seamlessly, Git doesn't -- in the sense that emulating the EZ> same workflow is more complicated and thus error-prone. To me, this EZ> spells that we fight the tool, i.e. our workflow should change. I think cherry-picking fixes from emacs-24 to master or vice-versa is the best way: * we tend to make commits in isolation, so there's no need to merge the whole branch in one shot. It's also much less risky as far as methodology. * "cherry-pick -x" will preserve the original commit info * "git diff" and "git log --cherry-pick" will do what people expect Ted