From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: [elpa]: I possibly broke something Date: Thu, 03 Dec 2015 18:44:12 +0100 Message-ID: <87r3j3whoz.fsf@fencepost.gnu.org> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1449164694 19660 80.91.229.3 (3 Dec 2015 17:44:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Dec 2015 17:44:54 +0000 (UTC) Cc: David =?iso-8859-1?Q?Gonz=E1lez_G=E1ndara?= , emacs-devel To: Artur Malabarba Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 03 18:44:51 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1a4Xw2-0001BE-P0 for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2015 18:44:50 +0100 Original-Received: from localhost ([::1]:36709 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Xw2-0004iC-0F for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2015 12:44:50 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Xvm-0004dX-Fb for emacs-devel@gnu.org; Thu, 03 Dec 2015 12:44:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4Xvl-0001R2-Kq for emacs-devel@gnu.org; Thu, 03 Dec 2015 12:44:34 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:38489) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Xvk-0001Ph-56; Thu, 03 Dec 2015 12:44:32 -0500 Original-Received: from localhost ([127.0.0.1]:52308 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.82) (envelope-from ) id 1a4Xvj-0006ne-Hk; Thu, 03 Dec 2015 12:44:31 -0500 Original-Received: by lola (Postfix, from userid 1000) id DABA3E69F1; Thu, 3 Dec 2015 18:44:12 +0100 (CET) In-Reply-To: (Artur Malabarba's message of "Thu, 3 Dec 2015 16:58:19 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:195821 Archived-At: Artur Malabarba writes: > 2015-12-02 23:27 GMT+00:00 Artur Malabarba : >> I'm looking at the latest diffs here and it looks like you didn't downgr= ade >> anything. >> >> On 2 Dec 2015 9:59 am, "David Gonz=E1lez G=E1ndara" >> wrote: >>> >>> I'm sorry about my unexpertise with git. I tried to merge my local chan= ges >>> with the ones Stefan Monnier's did fixing my package and I think I may = have >>> downgraded other changes. > > Just to ease your mind, David. I just checked git-blame and you most > certainly did not screw anything up. ;-) How would you check using git-blame that he did not accidentally revert changes in a bad merge? Neither the old nor the new lines would be traced to him. To check, you would rather use git-diff from before the merge on the master branch to after the merge: that should only show his own work. --=20 David Kastrup