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: Sat, 13 Dec 2014 15:13:25 +0100 Message-ID: <87sigjpri2.fsf@engster.org> References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <87ppbquo97.fsf@gmail.com> <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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418480044 1645 80.91.229.3 (13 Dec 2014 14:14:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 13 Dec 2014 14:14:04 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 13 15:13:57 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 1XznSG-00023A-4U for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 15:13:56 +0100 Original-Received: from localhost ([::1]:33232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XznSF-0004V9-Hp for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 09:13:55 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XznRx-0004US-Me for emacs-devel@gnu.org; Sat, 13 Dec 2014 09:13:43 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XznRs-0001hu-CL for emacs-devel@gnu.org; Sat, 13 Dec 2014 09:13:37 -0500 Original-Received: from randomsample.de ([5.45.97.173]:44516) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XznRs-0001he-3M for emacs-devel@gnu.org; Sat, 13 Dec 2014 09:13:32 -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:To:From; bh=X9Fpf4b4vsTQ9W42aTRUHCMglqowJz3RdK3tkCNvHHU=; b=SBkP17/ioCJ72Qvo9AlXw9z27Nhy5w+XpD4iUKiq2s2YFtCi9eESAwbTEXvdKENPBoA4DjqD5Km/clX+BQaxbOke63eCYl0uyL61fRmLW/oM3+CP9D4sbW6J/u6CM0ar; 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 1XznRq-0003KW-V9 for emacs-devel@gnu.org; Sat, 13 Dec 2014 15:13:31 +0100 In-Reply-To: <87zjarznzs.fsf@lifelogs.com> (Ted Zlatanov's message of "Sat, 13 Dec 2014 08:19:03 -0500") 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:180000 Archived-At: Ted Zlatanov writes: > On Sat, 13 Dec 2014 10:50:13 +0100 David Engster wrote: > > DE> David Engster writes: >>> Ted Zlatanov writes: >>>> On Fri, 12 Dec 2014 16:28:35 +0200 Eli Zaretskii wrote: >>>> > EZ> No need to fear, just remember to review what "git show" displays, > EZ> after the merge and before you push. If it doesn't look OK to you, > EZ> you can always reset to cancel the merge. >>>> >>>> Yup. I did it, carefully. >>> >>> I'm afraid something went wrong. You did not actually merge. >>> >>> Could it be that you somehow rebased before pushing (by doing 'pull >>> --rebase', for instance)? > > I don't think so? Now I'm just perplexed, too. I must have rebased the > commit accidentally. I *started* to rebase because a commit came in > before I pushed. Never rebase commits that are upstream. Rebasing will always create new commits (in case if you wondering, 'pull --rebase=preserve' doesn't change that; it will keep a merge commit, but that will not merge origin/emacs-24 anymore but a new set of commits). Instead, simply merge master into your tree. Despite what others may say, this is still a perfectly valid thing to do in Git. :-) This what 'git pull' will do by default (unless you configured it otherwise). > But I aborted the rebase, then redid the merge. Yes, it seems there was a pending commit when you finished the merge, so it was all squashed into one. When you want to start from scratch, the best thing to do is a hard reset on 'origin/master'. This will make sure you're in the same state as upstream. In any case, as much as I like Emacs, I really recommend to use 'gitk --all' to inspect your tree before pushing. This will show you immediately if you have created a proper merge from origin/emacs-24. > I'm sorry about this, Don't be. > I'll get it right next time. That's the spirit. -David