From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Thu, 18 Dec 2014 21:46:09 +0100 Message-ID: <87tx0sn0tq.fsf@engster.org> References: <20141211155740.11916.1584@vcs.savannah.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> <87vbldoqp2.fsf@engster.org> <83a92py3p3.fsf@gnu.org> <87mw6oodep.fsf@engster.org> <83lhm7wfd4.fsf@gnu.org> <87egrynhcd.fsf@engster.org> <83h9wtufwl.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418935614 4682 80.91.229.3 (18 Dec 2014 20:46:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 18 Dec 2014 20:46:54 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 18 21:46:49 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 1Y1hy7-0001T2-Dv for ged-emacs-devel@m.gmane.org; Thu, 18 Dec 2014 21:46:43 +0100 Original-Received: from localhost ([::1]:55715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1hy6-0002Fn-Sl for ged-emacs-devel@m.gmane.org; Thu, 18 Dec 2014 15:46:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1hxp-0002Fh-5M for emacs-devel@gnu.org; Thu, 18 Dec 2014 15:46:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1hxj-0007On-2m for emacs-devel@gnu.org; Thu, 18 Dec 2014 15:46:25 -0500 Original-Received: from randomsample.de ([5.45.97.173]:49200) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1hxi-0007Kq-RJ; Thu, 18 Dec 2014 15:46:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=hSo4SWe1AtzS+80FO7mUJ/OXC2z9sXRmydna7nhWDcE=; b=fKxLa5NwCoi9WERBbd25yTo9QW9gQbm1S48ZjHs2XYncXIwofG//b/o4Ptnt/v5xoMzqScjMlAaehJPUQCmJ0wzKA7glSmsJyrzf+L1CYYU7J7kBNZT1WwTNpLQX2OUK; Original-Received: from ip4d154cb9.dynamic.kabel-deutschland.de ([77.21.76.185] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Y1hxb-0006NA-FV; Thu, 18 Dec 2014 21:46:11 +0100 In-Reply-To: <83h9wtufwl.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 18 Dec 2014 17:38:34 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:180293 Archived-At: Eli Zaretskii writes: >> From: David Engster >> This conflicts with how Git orders the parents of a merge. The first >> parent is always the tip of the branch you're currently on. And since >> you do 'git pull' while being on your local master, that will be the >> first parent. >> >> I happen to dislike that about Git as well, but I agree with Stefan that >> this is not something we should worry about. Probably the easiest way >> without resorting to rebase you've already said yourself: delete the >> merge, do a fast-forward pull, merge again. > > But if we follow Stefan and stop worrying about the linearity of > mainline, then just "git pull" followed by another push is enough, > right? Yes, that is always safe. >> Of course, while *you* can take care in keeping the correct ordering of >> mainline, others won't do that (I guess most are not even aware of this >> issue), so I'm afraid you will be greeted with git's usual spaghetti >> history soon enough. > > Again, if we don't care about the mainline being linear, this > spaghetti is nothing to worry about, right? It's just a "normal" Git > DAG, right? Yes. > What really worries me about all this is that I _know_ some of the > more-or-less veteran contributors do have long-living branches, where > they do all their work, and from where they merge to master before > pushing. For those people, using "pull --rebase" might be trouble > waiting to happen at the most inopportune moment. Yes, although for local branches, really the worst that can happen is that you merge rebased commits, leading to a duplication of those commits in the history, which might be ugly and confusing, but it actually does no "real" harm. I'm not sure, but I think Git detects that those commits are identical through the patch-id, so you won't get conflicts. Also, you can delete those duplicates with another (interactive) rebase. -David