From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30021 invoked by alias); 13 Jan 2014 19:53: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 30012 invoked by uid 89); 13 Jan 2014 19:53:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 13 Jan 2014 19:53:34 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0DJrV2N009846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 Jan 2014 14:53:31 -0500 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0DJrTBb003643; Mon, 13 Jan 2014 14:53:30 -0500 Message-ID: <52D44439.2020807@redhat.com> Date: Mon, 13 Jan 2014 19:53:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Eli Zaretskii CC: brobecker@adacore.com, gdb-patches@sourceware.org Subject: Re: GDB 7.6.90 available for testing References: <20140108101428.C2280E003F@joel.gnat.com> <831u0ec2y6.fsf@gnu.org> <52D427A4.6010704@redhat.com> <83wqi368k7.fsf@gnu.org> <52D43408.404@redhat.com> <83vbxn67ij.fsf@gnu.org> <83sisr66ci.fsf@gnu.org> In-Reply-To: <83sisr66ci.fsf@gnu.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-SW-Source: 2014-01/txt/msg00368.txt.bz2 On 01/13/2014 07:15 PM, Eli Zaretskii wrote: >> Date: Mon, 13 Jan 2014 20:50:28 +0200 >> From: Eli Zaretskii >> Cc: brobecker@adacore.com, gdb-patches@sourceware.org >> >> Is there any difference between merge and cherry-pick in this case? merge would attempt to merge the whole of master into the branch starting from the branching point. > It seems msysgit's cherry-pick somehow converted gdbserver/ChangeLog > to DOS CRLF EOL format. So I needed one additional commit on the > branch to fix that, before pushing. Is that OK, or should I have done > something different? Ouch, sounds like a git bug... Yeah, it would have been better if that broken EOL change hadn't made it into the repository. E.g., now "git blame" on gdbserver's ChangeLog will show that commit as author of all of the file's lines. Luckily, as it was on the branch, not master, it probably won't ever affect anyone. You could, for example, have squashed those two commits into one (with git rebase) before pushing, ending up with a single commit that looked just like the one in master. Oh well, what's done is done now. ;-) -- Pedro Alves