From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 64366 invoked by alias); 2 Apr 2018 17:27:35 -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 64341 invoked by uid 89); 2 Apr 2018 17:27:34 -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,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=H*u:6.1, H*UA:6.1, learn, HContent-Transfer-Encoding:8bit X-HELO: userp2130.oracle.com Received: from userp2130.oracle.com (HELO userp2130.oracle.com) (156.151.31.86) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 02 Apr 2018 17:27:33 +0000 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w32HHDrA095398; Mon, 2 Apr 2018 17:27:22 GMT Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2130.oracle.com with ESMTP id 2h3rshg17x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 02 Apr 2018 17:27:22 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w32HQM03017258 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 2 Apr 2018 17:26:23 GMT Received: from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w32HQM6K003544; Mon, 2 Apr 2018 17:26:22 GMT Received: from [10.39.248.212] (/10.39.248.212) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 02 Apr 2018 10:26:22 -0700 Subject: Re: [PATCH5 PR gdb/16959] gdb hangs in infinite recursion To: Joel Brobecker Cc: Simon Marchi , gdb-patches@sourceware.org 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> <20180402134426.e5ys64idqvdx2cyv@adacore.com> From: Wei-min Pan Message-ID: Date: Mon, 02 Apr 2018 17:27: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: <20180402134426.e5ys64idqvdx2cyv@adacore.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8851 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=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1804020187 X-SW-Source: 2018-04/txt/msg00044.txt.bz2 On 4/2/2018 6:44 AM, Joel Brobecker wrote: >> 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. > Hi Joel, I tried it differently by merging the "fixes" branch to my "master" branch but got the same "non-fast-forward"  error when pushing: $ git checkout master $ git merge fixes $ git fetch upstream $ git push upstream master:master To ssh://sourceware.org/git/binutils-gdb.git  ! [rejected]        master -> master (non-fast-forward) error: failed to push some refs to 'ssh://sourceware.org/git/binutils-gdb.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again.  See the 'Note about fast-forwards' section of 'git push --help' for details. Maybe output from the "status" command sheds some light? $ git status # On branch master # Your branch is ahead of 'origin/master' by 19 commits. # nothing to commit (working directory clean) Thanks.