From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Famulari <leo@famulari.name>
Subject: Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2
Date: Thu, 25 Feb 2016 18:13:03 -0500
Message-ID: <20160225231303.GA32264@jasmine>
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>
	<87povke7f3.fsf@dustycloud.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46717)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1aZ55r-0005bF-D5
	for guix-devel@gnu.org; Thu, 25 Feb 2016 18:13:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1aZ55o-0007SO-7D
	for guix-devel@gnu.org; Thu, 25 Feb 2016 18:13:11 -0500
Received: from out5-smtp.messagingengine.com ([66.111.4.29]:33501)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1aZ55o-0007SH-0Y
	for guix-devel@gnu.org; Thu, 25 Feb 2016 18:13:08 -0500
Content-Disposition: inline
In-Reply-To: <87povke7f3.fsf@dustycloud.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: Christopher Allan Webber <cwebber@dustycloud.org>
Cc: guix-devel <guix-devel@gnu.org>

On Thu, Feb 25, 2016 at 02:45:04PM -0800, Christopher Allan Webber wrote:
> 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

This will discard any other work you've done on the master branch.

I would do `git diff HEAD..origin/master` to see what the difference is.