From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?B?RGF2aWQgR29uesOhbGV6IEfDoW5kYXJh?= Newsgroups: gmane.emacs.devel Subject: Re: [elpa]: I possibly broke something Date: Fri, 4 Dec 2015 12:37:00 +0100 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a113ff184fb56f8052610ec32 X-Trace: ger.gmane.org 1449229034 29281 80.91.229.3 (4 Dec 2015 11:37:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Dec 2015 11:37:14 +0000 (UTC) Cc: Artur Malabarba , emacs-devel To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 04 12:37:12 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 1a4ofn-0005bt-0Q for ged-emacs-devel@m.gmane.org; Fri, 04 Dec 2015 12:37:11 +0100 Original-Received: from localhost ([::1]:40134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4ofl-00013y-5f for ged-emacs-devel@m.gmane.org; Fri, 04 Dec 2015 06:37:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4ofg-0000yY-Bm for emacs-devel@gnu.org; Fri, 04 Dec 2015 06:37:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4off-0001Eb-7J for emacs-devel@gnu.org; Fri, 04 Dec 2015 06:37:04 -0500 Original-Received: from mail-io0-x244.google.com ([2607:f8b0:4001:c06::244]:32926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4ofd-0001DX-Lo; Fri, 04 Dec 2015 06:37:01 -0500 Original-Received: by ioef137 with SMTP id f137so10295333ioe.0; Fri, 04 Dec 2015 03:37:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:cc:content-type; bh=76+44FfQujUMx7E5Xndci4v4vHfJS0CCErEA95GyuqU=; b=OZkSUBa1jq5hOQl7/H7N1J80CDRzlrtTTkBgF8GketCW9XGE3H9G2VOeR3OlS6h2sI A0407aAJ4b+GciFwFBUs/kA7z9VBO5dMHzDbnlkjfLkAtquwuDXe5H94WQEN+WtqPaqg W1W2D8eRclPuf1Qqe6/9E4HOyaHQDpMRPK+S7YguQSNBmvr3gp/hId4vMToegggRAAGw gXhsfCCmW72j8BqXzuIgxOaBoOmb9yt6SlREo9Ripv/9x7YgQmZRrTL2Hp6cxppbTjJx GBvZPMAHUWsh1fmz4kV6jSXhAXzDS7s2bg/UOi6+tAg6wJXW461TTldmo/EZMF+xazVw WT4A== X-Received: by 10.107.16.21 with SMTP id y21mr15358190ioi.194.1449229020778; Fri, 04 Dec 2015 03:37:00 -0800 (PST) Original-Received: by 10.36.10.145 with HTTP; Fri, 4 Dec 2015 03:37:00 -0800 (PST) X-Google-Sender-Auth: -t24peDyNZ9l44fgWMJOvgaOrTw X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c06::244 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:195883 Archived-At: --001a113ff184fb56f8052610ec32 Content-Type: text/plain; charset=UTF-8 Thanks for checking. I had never worked in git collaboratelly, I hope I get used to it soon. On 3 December 2015 at 21:20, David Kastrup wrote: > Artur Malabarba writes: > > > 2015-12-03 17:44 GMT+00:00 David Kastrup : > >> 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. > > > > I had already checked (and stated) earlier that he didn't revert > > anything (with the diffs). Now I just checked whether he had "taken > > ownership" of any previous changes (with blame). > > That's actually neigh impossible for a conflictless merge commit. git > blame should not likely attribute anything to the committer of a merge > but manually resolved merge conflicts. > > -- > David Kastrup > --001a113ff184fb56f8052610ec32 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Thanks for checking. I had never worked in git collaborate= lly, I hope I get used to it soon.

On 3 December 2015 at 21:20, David Kastrup <dak@gnu.org> wrote:
Artur Malabarba <bruce.connor.am@gmail.com> writes:

> 2015-12-03 17:44 GMT+00:00 David Kastrup <dak@gnu.org>:
>> How would you check using git-blame that he did not accidentally r= evert
>> changes in a bad merge?=C2=A0 Neither the old nor the new lines wo= uld be
>> traced to him.
>
> I had already checked (and stated) earlier that he didn't revert > anything (with the diffs). Now I just checked whether he had "tak= en
> ownership" of any previous changes (with blame).

That's actually neigh impossible for a conflictless merge c= ommit.=C2=A0 git
blame should not likely attribute anything to the committer of a merge
but manually resolved merge conflicts.

--
David Kastrup

--001a113ff184fb56f8052610ec32--