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: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Wed, 17 Dec 2014 11:52:54 +0100 Organization: Probably a good idea Message-ID: References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <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> <87vbldoqp2.fsf@engster.org> <83a92py3p3.fsf@gnu.org> <87mw6oodep.fsf@engster.org> <83lhm7wfd4.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418813622 29322 80.91.229.3 (17 Dec 2014 10:53:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 17 Dec 2014 10:53:42 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 17 11:53:35 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 1Y1CEY-00028p-25 for ged-emacs-devel@m.gmane.org; Wed, 17 Dec 2014 11:53:34 +0100 Original-Received: from localhost ([::1]:48833 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1CEX-0005uq-7z for ged-emacs-devel@m.gmane.org; Wed, 17 Dec 2014 05:53:33 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1CEF-0005to-Py for emacs-devel@gnu.org; Wed, 17 Dec 2014 05:53:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1CE9-00052j-Uy for emacs-devel@gnu.org; Wed, 17 Dec 2014 05:53:15 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:54157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1CE9-00052Y-O8 for emacs-devel@gnu.org; Wed, 17 Dec 2014 05:53:09 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Y1CE6-0001zP-Um for emacs-devel@gnu.org; Wed, 17 Dec 2014 11:53:07 +0100 Original-Received: from steria10.steria.no ([195.204.41.10]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 17 Dec 2014 11:53:06 +0100 Original-Received: from sb by steria10.steria.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 17 Dec 2014 11:53:06 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 34 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: steria10.steria.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (windows-nt) Cancel-Lock: sha1:ZgnRU7zc2EdbGMlrDFf85hi3D3s= 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:180223 Archived-At: >>>>> Steinar Bang : > and at this point I have no idea what the branches look like, since > I've never used "--rebase=preserve". I still haven't used it, but I have googled a bit, and I found this: http://stackoverflow.com/a/15915431 Example 3 looks a lot like what I outlined, ie. you would get something like this: > -a---b-c-d-i-j-h- master > \ \ / > e-f----\/ > \g---- eli-feature-1 > where "i" and "j" are the commits that blocked your push, and "h" is a > rebased version of "g"? And if so, there will never be a problem with "b", "c", and "d", because they are recorded in "h" (which is the rebased "g"). But there _will_ be a problem if you continue with eli-feature-1 with "g" in the graph. Ie. you will need to pop off a non-rebased merge commit and replace it with the rebased one on one of the the two branches with you proceed (the merge commit can be rebased on either branch, but it's probably less work to do the rebase together with the pull on master, and then fix it later in the feature branch). Unless someone has written an extension to let you rebase two branches simultanously...? It wouldn't surprise me, but a quick googling didn't turn up anything.