From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christopher Allan Webber Subject: Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2 Date: Thu, 25 Feb 2016 15:52:03 -0800 Message-ID: <87oab4e4bg.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> <87povke7f3.fsf@dustycloud.org> <20160225231303.GA32264@jasmine> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZ5hb-00050p-LA for guix-devel@gnu.org; Thu, 25 Feb 2016 18:52:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZ5hW-0000Hh-Gt for guix-devel@gnu.org; Thu, 25 Feb 2016 18:52:11 -0500 Received: from dustycloud.org ([50.116.34.160]:56896) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZ5hW-0000Hd-Ch for guix-devel@gnu.org; Thu, 25 Feb 2016 18:52:06 -0500 In-reply-to: <20160225231303.GA32264@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Leo Famulari Cc: guix-devel Leo Famulari writes: > 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 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. Yeah, listen to Leo first before you listen to me :) (Even if you listened to me first, if you don't garbage collect git, you can get it back via the reflog, fyi)