From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 8E0973858D3C for ; Sun, 6 Feb 2022 20:34:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8E0973858D3C Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 216KXaWq021793 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 6 Feb 2022 15:33:41 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 216KXaWq021793 Received: from [10.0.0.11] (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 39DA81ECEB; Sun, 6 Feb 2022 15:33:36 -0500 (EST) Message-ID: <2d84de61-dd35-1f84-13fe-a3917b9cafeb@polymtl.ca> Date: Sun, 6 Feb 2022 15:33:35 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 Subject: Re: [PATCH 3/5] gdb/python: allow redefinition of python GDB/MI commands Content-Language: en-US To: Lancelot SIX , Jan Vrany Cc: gdb-patches@sourceware.org References: <20220117124425.2658516-1-jan.vrany@labware.com> <20220117124425.2658516-4-jan.vrany@labware.com> <20220206171355.ldrvzh5pq46hpnom@Plymouth> From: Simon Marchi In-Reply-To: <20220206171355.ldrvzh5pq46hpnom@Plymouth> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Sun, 6 Feb 2022 20:33:36 +0000 X-Spam-Status: No, score=-3033.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, NICE_REPLY_A, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2022 20:34:47 -0000 > Here you change the indentation from the previous patch. This change > should probably be moved to it. > > I understand that this is tedious to change and am sorry for that. Yeah, it looks like there is a good number of changes in this patch that adjust things added in the previous patch. These changes should indeed be folded in the previous patch. I was going to comment on some of them only to find out they get changed here, for no particular reason. FYI, with the right tools it's not too tedious. Here's how I do this particular change: 1. "git config diff.tool meld", to set meld as my diff tool of choice 2. use "git rebase -i" to go to patch 2 3. "git difftool --dir-diff " That opens Meld, showing the diff between patches 2 and 3. That lets you bring in the changes you want from patch 3 to 2. Once you're done, amend the commit, finish the rebase. Simon