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: Fri, 19 Dec 2014 08:57:47 +0100 Organization: Probably a good idea Message-ID: 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> <83h9wtufwl.fsf@gnu.org> <87vbl8kafo.fsf@dod.no> <83mw6ku266.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418975904 12068 80.91.229.3 (19 Dec 2014 07:58:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 19 Dec 2014 07:58:24 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 19 08:58: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 1Y1sS1-0004XL-C8 for ged-emacs-devel@m.gmane.org; Fri, 19 Dec 2014 08:58:17 +0100 Original-Received: from localhost ([::1]:57162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1sS0-0004iZ-QB for ged-emacs-devel@m.gmane.org; Fri, 19 Dec 2014 02:58:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1sRs-0004iB-1m for emacs-devel@gnu.org; Fri, 19 Dec 2014 02:58:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1sRm-00014E-4H for emacs-devel@gnu.org; Fri, 19 Dec 2014 02:58:07 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:48904) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1sRl-00013x-Tk for emacs-devel@gnu.org; Fri, 19 Dec 2014 02:58:02 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Y1sRi-0004QT-Qz for emacs-devel@gnu.org; Fri, 19 Dec 2014 08:57:58 +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 ; Fri, 19 Dec 2014 08:57:58 +0100 Original-Received: from sb by steria10.steria.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 19 Dec 2014 08:57:58 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 40 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:iWjRabnRjT0K5aeLbL+pW5oB2Bw= 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:180314 Archived-At: >>>>> Yuri Khan : > On Fri, Dec 19, 2014 at 2:35 AM, Eli Zaretskii wrote: >> They must merge from master before the push, to test the merge >> results. > Why not merge *into* master and test that before pushing? My guess would be that they merge in regularily from master or emacs-24, to make sure they stay in sync...? Ie. git checkout my-feature-branch git fetch git merge origin/master git fetch git merge origin/master etc. And that's OK, it's only the final merge to master (and subsequent commits) that will be rebased with a pull. So if they do: git checkout master git merge --no-ff my-feature-branch git push git pull git push the rebased commit will only be on master and not on my-feature-branch (the --no-ff argument to merge, causes git to always create a merge commit, even if the merge is a FF)