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: Fri, 19 Dec 2014 11:16:51 +0200 Message-ID: <8361d8t2ws.fsf@gnu.org> References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <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> <83lhm4u1y3.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1418980645 20331 80.91.229.3 (19 Dec 2014 09:17:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 19 Dec 2014 09:17:25 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 19 10:17:17 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 1Y1tgS-0003h6-Em for ged-emacs-devel@m.gmane.org; Fri, 19 Dec 2014 10:17:16 +0100 Original-Received: from localhost ([::1]:57454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1tgM-00006q-SC for ged-emacs-devel@m.gmane.org; Fri, 19 Dec 2014 04:17:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1tgD-00005p-Nt for emacs-devel@gnu.org; Fri, 19 Dec 2014 04:17:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1tg7-00062f-GR for emacs-devel@gnu.org; Fri, 19 Dec 2014 04:17:01 -0500 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:54974) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1tg7-00062Z-7q for emacs-devel@gnu.org; Fri, 19 Dec 2014 04:16:55 -0500 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NGT00K00NSU7Q00@mtaout28.012.net.il> for emacs-devel@gnu.org; Fri, 19 Dec 2014 11:14:38 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NGT00LCBOCDS900@mtaout28.012.net.il>; Fri, 19 Dec 2014 11:14:38 +0200 (IST) In-reply-to: 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.184 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:180322 Archived-At: > From: Steinar Bang > Date: Fri, 19 Dec 2014 09:09:03 +0100 > > > 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. > > Not so much conflicts merging that way, but version number stuff always > show up on the first merge, and sometimes later as well (it's good to > check). What do you mean by "version number stuff"? > And in emacs' case there has been the ChangeLog stuff This doesn't cause conflicts most of the time, if you use the git-merge-changelog driver. > > Which makes all the precautions like --no-ff and --no-commit > > unnecessary, I think. > > I don't do it merging in to my own branches, but I always give published > merges a final look-over in this way before pushing them (ie. merges > _to_ master and release branches). Yes, but "git show" before pushing will do it well enough.