From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christopher Allan Webber <cwebber@dustycloud.org>
Subject: Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2
Date: Thu, 25 Feb 2016 14:45:04 -0800
Message-ID: <87povke7f3.fsf@dustycloud.org>
References: <20160219120106.62631a44@scratchpost.org>
	<20160219212258.GA4418@jasmine>
	<20160222013949.186f25bc@scratchpost.org>
	<87egc54gg4.fsf@dustycloud.org>
	<20160224233918.3d70dd72@scratchpost.org>
	<87vb5dr6wx.fsf@dustycloud.org>
	<20160225015212.2dc928c3@scratchpost.org>
	<878u28fzik.fsf@dustycloud.org>
	<20160225232223.3c0fa3b1@scratchpost.org>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41946)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cwebber@dustycloud.org>) id 1aZ4em-0005yX-Mv
	for guix-devel@gnu.org; Thu, 25 Feb 2016 17:45:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cwebber@dustycloud.org>) id 1aZ4ei-0000eQ-4i
	for guix-devel@gnu.org; Thu, 25 Feb 2016 17:45:12 -0500
Received: from dustycloud.org ([50.116.34.160]:56838)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cwebber@dustycloud.org>) id 1aZ4ei-0000eI-0f
	for guix-devel@gnu.org; Thu, 25 Feb 2016 17:45:08 -0500
In-reply-to: <20160225232223.3c0fa3b1@scratchpost.org>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Danny Milosavljevic <dannym@scratchpost.org>
Cc: guix-devel <guix-devel@gnu.org>

Danny Milosavljevic writes:

> Hi,
>
> first, thanks for the review and test and commit.
>
> On Thu, 25 Feb 2016 09:53:17 -0800
> Christopher Allan Webber <cwebber@dustycloud.org> wrote:
>
>> This looks ready to go, though it still lacks a changelog style commit
>> message, 
>
> I committed it locally, with a commit message... *shrugs*. 
> I think git format-patch put the message into the subject.
> Should I manually write a changelog-style blurb, too?
>
>>and it isn't formatted with git format-patch.
>
> Huh? After the local commit I called git format-patch to format it and the mail with the patch was created from its output.
>
> btw: Now git pull merges every time I pull... hmmmmm...

If you committed your own patch to master, that's not the same as what
will be applied upstream.  I failed to push earlier today (someone else
had), but it's actually up now.  If you ensure that your commit is
actually upstream (check the logs) and you're on master you can do:

  git reset --hard origin/master

and that might help.