From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Thu, 18 Dec 2014 22:40:04 +0200 Message-ID: <83lhm4u1y3.fsf@gnu.org> References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <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> <87vbldoqp2.fsf@engster.org> <83a92py3p3.fsf@gnu.org> <87mw6oodep.fsf@engster.org> <83lhm7wfd4.fsf@gnu.org> <87egrynhcd.fsf@engster.org> <87wq5pd0ap.fsf@uwakimon.sk.tsukuba.ac.jp> <83fvcdufv9.fsf@gnu.org> <87r3vwk9tr.fsf@dod.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1418935251 30951 80.91.229.3 (18 Dec 2014 20:40:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 18 Dec 2014 20:40:51 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 18 21:40:44 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 1Y1hsJ-0007xE-Un for ged-emacs-devel@m.gmane.org; Thu, 18 Dec 2014 21:40:44 +0100 Original-Received: from localhost ([::1]:55707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1hsJ-00011i-Cr for ged-emacs-devel@m.gmane.org; Thu, 18 Dec 2014 15:40:43 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1hrs-00011W-Rw for emacs-devel@gnu.org; Thu, 18 Dec 2014 15:40:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1hrl-0004zX-Cv for emacs-devel@gnu.org; Thu, 18 Dec 2014 15:40:16 -0500 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:43238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1hrl-0004yl-4A for emacs-devel@gnu.org; Thu, 18 Dec 2014 15:40:09 -0500 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NGS00N00P7J1I00@mtaout29.012.net.il> for emacs-devel@gnu.org; Thu, 18 Dec 2014 22:37:34 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NGS00N1KPAMEW00@mtaout29.012.net.il>; Thu, 18 Dec 2014 22:37:34 +0200 (IST) In-reply-to: <87r3vwk9tr.fsf@dod.no> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.185 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:180292 Archived-At: > From: Steinar Bang > Date: Thu, 18 Dec 2014 21:00:00 +0100 > > > cd ../trunk # another clone > > git checkout master > > git pull > > git merge origin/emacs-24 > > What I would do here, is: > git merge --no-ff --no-commit origin/emacs-24 > > Then I would inspect the diffs in magit, fix any conflicts, and stage > the conflict-fixed files, revert the changes that shouldn't be there > (typically version-related stuff, and this is mostly taken care off on > the first merge, but it never hurts to check), and then do 'c c' in > magit to commit the merge. > > > > > git push Not sure how what you suggest is different, in principle. Why does it matter if I examine the results of a merge before or after I commit it? It's a local commit, and I can always go back if I need to. But I see no reason to assume up front I'd need to back up, since we are talking about a merge from the release branch, not from a development branch. So I have all the reasons to believe the merge will be uneventful, and there will be no conflicts most of the time. Which makes all the precautions like --no-ff and --no-commit unnecessary, I think.