From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 91750 invoked by alias); 31 Mar 2018 03:32:44 -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 91738 invoked by uid 89); 31 Mar 2018 03:32:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-languages-length:1858, H*u:6.1, H*UA:6.1 X-HELO: userp2120.oracle.com Received: from userp2120.oracle.com (HELO userp2120.oracle.com) (156.151.31.85) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 31 Mar 2018 03:32:42 +0000 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w2V3Hvw0090761; Sat, 31 Mar 2018 03:32:30 GMT Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2120.oracle.com with ESMTP id 2h22a900sb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 31 Mar 2018 03:32:30 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w2V3BtHv027999 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 31 Mar 2018 03:11:55 GMT Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w2V3BsEj020048; Sat, 31 Mar 2018 03:11:55 GMT Received: from [10.154.165.208] (/10.154.165.208) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 30 Mar 2018 20:11:54 -0700 Subject: Re: [PATCH5 PR gdb/16959] gdb hangs in infinite recursion To: Joel Brobecker Cc: Simon Marchi , gdb-patches@sourceware.org References: <1522269884-129860-1-git-send-email-weimin.pan@oracle.com> <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> From: Wei-min Pan Message-ID: <79789d48-f0d3-7a76-f22d-6db52e780389@oracle.com> Date: Sat, 31 Mar 2018 03:32:00 -0000 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180331015242.zndajxnpmpieltto@adacore.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8848 signatures=668697 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=940 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1803310029 X-SW-Source: 2018-03/txt/msg00634.txt.bz2 On 3/30/2018 6:52 PM, Joel Brobecker wrote: >>> Not quite. It is telling you that your "fixes" branch is behind >>> upstream's "master". You need to do a "rebase" your "fixes" branch >>> instead (while having the "fixes" being the current branch): >>> >>> $ git rebase upstream/master >>> >>> You may have some conflicts to resolve, particularly around >>> ChangeLog files. >> After the "git rebase" command, it no longer points to my branch: > That tells me the rebase did not complete successfully (the merge > conflict I was talking about). What output did you get when you > rebased? Did you resolve the merge conflict? And after you did so, > did you do a "git rebase --continue"? 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. > Looking around, I found the following documentation which seems to > provide some information on how to handle merge conflicts after > a git rebase. > > https://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/ > https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ > https://help.github.com/articles/about-merge-conflicts/ Will read the above documentation for clue. Thanks. > If you're not sure where you are, right now, try the following: > > $ git rebase --abort > > That should abort the rebase operation, and get you back where you > started; and in particular, the current branch should be back to > the "fixes" branch. >