From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: dealing with local patches - mercurial queues over bzr/git checkout Date: Tue, 07 Jan 2014 09:41:05 +0100 Organization: Organization?!? Message-ID: <87wqicrxpa.fsf@fencepost.gnu.org> References: <1389035494635-308685.post@n5.nabble.com> <83r48ksys4.fsf@gnu.org> <87vbxw93t8.fsf@Rainer.invalid> <83mwj8sbie.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389084325 14764 80.91.229.3 (7 Jan 2014 08:45:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 08:45:25 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 09:45:29 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 1W0SHp-0001qh-Bl for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 09:45:21 +0100 Original-Received: from localhost ([::1]:39370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0SHp-0003RI-1h for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 03:45:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0SHh-0003Qa-2J for emacs-devel@gnu.org; Tue, 07 Jan 2014 03:45:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0SHb-0004Pq-RY for emacs-devel@gnu.org; Tue, 07 Jan 2014 03:45:12 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:49417) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0SHb-0004PZ-LY for emacs-devel@gnu.org; Tue, 07 Jan 2014 03:45:07 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0SHY-0001Jg-Fc for emacs-devel@gnu.org; Tue, 07 Jan 2014 09:45:04 +0100 Original-Received: from x2f5214e.dyn.telefonica.de ([2.245.33.78]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 09:45:04 +0100 Original-Received: from dak by x2f5214e.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 09:45:04 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 20 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f5214e.dyn.telefonica.de X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:Rcwg9VSH+OkRj1LxKMsuggX5kZo= 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:167581 Archived-At: Eli Zaretskii writes: >> From: Achim Gratz >> Date: Mon, 06 Jan 2014 22:51:47 +0100 >> >> I find that in Git simply rebasing the local branch on top of upstream >> (which can be configured to be done instead of a merge when you "pull") >> keeps that history inside the local branch intact while producing a nice >> linear history when you finally push it upstream (with or without >> rewriting it before the push), without the messiness of many superfluous >> merges. > > But then if I need to bisect the merge done by you, I see a single > large commit, instead of the series of small ones. And that makes it > hard both to bisect and, if needed, revert a small part of the merge. -- David Kastrup