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 20:44:18 +0100 Message-ID: <87mw6rpc6l.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> <87sigjpri2.fsf@engster.org> <838uib60jv.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418499890 800 80.91.229.3 (13 Dec 2014 19:44:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 13 Dec 2014 19:44:50 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 13 20:44:41 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 1XzscL-0001BB-43 for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 20:44:41 +0100 Original-Received: from localhost ([::1]:34125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzscK-0001Zw-Ks for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 14:44:40 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzscB-0001Zr-QI for emacs-devel@gnu.org; Sat, 13 Dec 2014 14:44:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xzsc5-0007qx-NP for emacs-devel@gnu.org; Sat, 13 Dec 2014 14:44:31 -0500 Original-Received: from randomsample.de ([5.45.97.173]:44785) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xzsc5-0007qo-Ei; Sat, 13 Dec 2014 14:44:25 -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=KSpltKcCBB0uJcfh7ZMaaNG77/qj9koimIMbu2HsKtY=; b=NPXjTJcUp0DaTAg5g1NmJ7XzibAXgQpgm5R4Fcberh6LkbU8DPFFNHRmrUUNIXsysQU4xLskt/JGYZzuEFTqogF2J3fQ/f7HQ+GI3Wrmm5vcdJY4ijLuXcBM8yTVmAxx; 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 1Xzsc4-0006Ms-Ak; Sat, 13 Dec 2014 20:44:24 +0100 In-Reply-To: <838uib60jv.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 13 Dec 2014 17:18:12 +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:180033 Archived-At: Eli Zaretskii writes: >> From: David Engster >> Date: Sat, 13 Dec 2014 15:13:25 +0100 >> >> 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). > > English, please: what does that mean? When you rebase a commit, it becomes a new one. Therefore, you can only safely rebase "local" commits (meaning: commits only *you* have). > The documentation seems to suggest that "pull --rebase=preserve" is > exactly the right thing in this situation. The name "preserve" is misleading. It does not mean that you have the same merge after the rebase. That's not possible, since the commits change during this operation. It helps to think of a rebase simply as a series of cherry-picks. Any conflicts you resolved in a merge commit are now resolved commit by commit. If you do 'rebase=preserve', what git does is: it tries to re-create(!) the merge commit with the rebased commits afterwards. This merge commit is pure metadata now, since there are no conflicts to resolve. So practically, 'rebase=preserve' is only meant for *unpushed* local branches you have merged, and you want to keep the metadata of this local merge. >> 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). > > Yes, but then my commits will appear as merge-commits, won't they? Not sure what you mean. This is equivalent to the merge-based workflow we had with Bazaar. -David