From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 48029 invoked by alias); 2 Apr 2018 13:44:31 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 48020 invoked by uid 89); 2 Apr 2018 13:44:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=redo, learn, HContent-Transfer-Encoding:8bit X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 02 Apr 2018 13:44:29 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 877CE116AF8; Mon, 2 Apr 2018 09:44:28 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id C5I6ffBn5+fR; Mon, 2 Apr 2018 09:44:28 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 4D3F6116AF5; Mon, 2 Apr 2018 09:44:28 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id 95C6783313; Mon, 2 Apr 2018 06:44:26 -0700 (PDT) Date: Mon, 02 Apr 2018 13:44:00 -0000 From: Joel Brobecker To: Wei-min Pan Cc: Simon Marchi , gdb-patches@sourceware.org Subject: Re: [PATCH5 PR gdb/16959] gdb hangs in infinite recursion Message-ID: <20180402134426.e5ys64idqvdx2cyv@adacore.com> References: <20cf4b23322670e4dc513183ef2dda45@polymtl.ca> <96ab9fda-2c03-a9c6-1da9-70e807e69e5c@oracle.com> <3505af0b-d303-b556-0a4c-c416ac88a064@polymtl.ca> <337f2b1f-6fe8-07f3-f4cd-a9b5a3d5456d@oracle.com> <20180330225218.fqhgvt7pzaqewic3@adacore.com> <0bb09bd9-812c-0665-3112-353c0e9cef0e@oracle.com> <20180330234143.mtj7u2xcfi7oxli4@adacore.com> <8c729b8f-24db-c746-e0e6-744ca7edd92f@oracle.com> <20180331015242.zndajxnpmpieltto@adacore.com> <79789d48-f0d3-7a76-f22d-6db52e780389@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <79789d48-f0d3-7a76-f22d-6db52e780389@oracle.com> User-Agent: NeoMutt/20170113 (1.7.2) X-SW-Source: 2018-04/txt/msg00039.txt.bz2 > Sorry, I lost the output. But I did resolve the merge conflicts by modifying > the > ChangeLog files.  I just did a "git rebase  --continue" which I didn't do > before > and it points to my branch and shows my patch: > > %  git add ChangeLog > %  git add testsuite/ChangeLog > %  git rebase --continue > %  git commit --amend > %  git show > > But when I tried to push again, I got the same "non-fast-forward" error as > if no merges were ever done. This is most likely because someone pushed a change between the moment you fetched + rebased, and the moment you tried to push the rebased result. You're going to have to redo it again, I'm afraid. Once you learn to handle those merge failures quickly, this will almost never happen. -- Joel