From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 2A6B1431FBC for ; Sun, 24 Aug 2014 13:07:54 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E2wWpIcjjKiO for ; Sun, 24 Aug 2014 13:07:49 -0700 (PDT) Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id DB3F6431FAE for ; Sun, 24 Aug 2014 13:07:49 -0700 (PDT) Received: from remotemail by yantan.tethera.net with local (Exim 4.80) (envelope-from ) id 1XLe4q-0006WL-O4; Sun, 24 Aug 2014 17:07:48 -0300 Received: (nullmailer pid 14117 invoked by uid 1000); Sun, 24 Aug 2014 20:07:43 -0000 From: David Bremner To: "W. Trevor King" Subject: Re: [PATCH v3] nmbug: Translate to Python In-Reply-To: <20140806233803.GJ31313@odin.tremily.us> References: <84447a0ed48412e1587761d560d18cb5affd4f66.1405897133.git.wking@tremily.us> <878un36bd5.fsf@maritornes.cs.unb.ca> <871tsue7gl.fsf@maritornes.cs.unb.ca> <20140806233803.GJ31313@odin.tremily.us> User-Agent: Notmuch/0.18.1+72~g028c560 (http://notmuchmail.org) Emacs/24.3.1 (x86_64-pc-linux-gnu) Date: Sun, 24 Aug 2014 13:07:43 -0700 Message-ID: <874mx1ejn4.fsf@maritornes.cs.unb.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: notmuch@notmuchmail.org X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 20:07:54 -0000 "W. Trevor King" writes: > On Tue, Aug 05, 2014 at 10:24:10PM -0300, David Bremner wrote: >> I have a local commit that deletes a couple tags; when I attempt to >> merge I get complaints about local changes to files. >>=20 >> error: Your local changes to the following files would be overwritten by= merge: >> tags/1406859003-11561-2-git-send-email-amdragon@mit.edu/needs-review >> tags/1406859003-11561-3-git-send-email-amdragon@mit.edu/needs-review >> Please, commit your changes or stash them before you can merge. >> =E2=80=A6 >> Calling the perl version of nmbug successfully creates a little=20 >> diamond merge > > The Perl version has: > > git ( { GIT_WORK_TREE =3D> $tempwork }, 'checkout', '-f', 'HEAD'); > git ( { GIT_WORK_TREE =3D> $tempwork }, 'merge', $commit); > > But the Python version only has: > > _git( > args=3D['merge', reference], > additional_env=3D{'GIT_WORK_TREE': workdir}, > wait=3DTrue) > > I suppose we need the checkout to populate the working directory, but > I'm not sure we want to force the checkout. Do we expect to have > unmerged entries in the index? I can't remember now why the checkout was forced, so as long as you can test it, I guess try the unforced version first. I guess the merge will fail if there are unmerged entries in the index, but maybe we can find out why that happens and prevent it. d