From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: dealing with local patches - mercurial queues over bzr/git checkout Date: Tue, 07 Jan 2014 20:58:00 +0100 Organization: Linux Private Site Message-ID: <87iotv4l9z.fsf@Rainer.invalid> 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 1389124705 24964 80.91.229.3 (7 Jan 2014 19:58:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 19:58: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 20:58:32 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 1W0cnI-0002qr-34 for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 20:58:32 +0100 Original-Received: from localhost ([::1]:42562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0cnH-0001zD-PQ for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 14:58:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0cn9-0001z3-RZ for emacs-devel@gnu.org; Tue, 07 Jan 2014 14:58:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0cn3-0001Hx-MU for emacs-devel@gnu.org; Tue, 07 Jan 2014 14:58:23 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:56539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0cn3-0001Hr-Fc for emacs-devel@gnu.org; Tue, 07 Jan 2014 14:58:17 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0cn0-00027e-Sy for emacs-devel@gnu.org; Tue, 07 Jan 2014 20:58:14 +0100 Original-Received: from pd9eb0490.dip0.t-ipconnect.de ([217.235.4.144]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 20:58:14 +0100 Original-Received: from Stromeko by pd9eb0490.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 20:58:14 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 20 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pd9eb0490.dip0.t-ipconnect.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:LiPMcLgQE8lfBMf1uwOT0bg49Dc= 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:167671 Archived-At: Eli Zaretskii writes: > 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. Please try it yourself. If you use the workflow I described, there is either no merge at all or a single merge; but all your commits, large or small, are still present after the push including their timeline. The only thing different from the "standard" workflow is that there aren't spurious merges to upstream inbetween, so it's vastly easier to follow what you did from looking at the log. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada