1 Return-Path: <david@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 2A6B1431FBC
\r
6 for <notmuch@notmuchmail.org>; Sun, 24 Aug 2014 13:07:54 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id E2wWpIcjjKiO for <notmuch@notmuchmail.org>;
\r
16 Sun, 24 Aug 2014 13:07:49 -0700 (PDT)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id DB3F6431FAE
\r
21 for <notmuch@notmuchmail.org>; Sun, 24 Aug 2014 13:07:49 -0700 (PDT)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <david@tethera.net>)
\r
24 id 1XLe4q-0006WL-O4; Sun, 24 Aug 2014 17:07:48 -0300
\r
25 Received: (nullmailer pid 14117 invoked by uid 1000); Sun, 24 Aug 2014
\r
27 From: David Bremner <bremner@debian.org>
\r
28 To: "W. Trevor King" <wking@tremily.us>
\r
29 Subject: Re: [PATCH v3] nmbug: Translate to Python
\r
30 In-Reply-To: <20140806233803.GJ31313@odin.tremily.us>
\r
32 <84447a0ed48412e1587761d560d18cb5affd4f66.1405897133.git.wking@tremily.us>
\r
33 <878un36bd5.fsf@maritornes.cs.unb.ca> <871tsue7gl.fsf@maritornes.cs.unb.ca>
\r
34 <20140806233803.GJ31313@odin.tremily.us>
\r
35 User-Agent: Notmuch/0.18.1+72~g028c560 (http://notmuchmail.org) Emacs/24.3.1
\r
36 (x86_64-pc-linux-gnu)
\r
37 Date: Sun, 24 Aug 2014 13:07:43 -0700
\r
38 Message-ID: <874mx1ejn4.fsf@maritornes.cs.unb.ca>
\r
40 Content-Type: text/plain; charset=utf-8
\r
41 Content-Transfer-Encoding: quoted-printable
\r
42 Cc: notmuch@notmuchmail.org
\r
43 X-BeenThere: notmuch@notmuchmail.org
\r
44 X-Mailman-Version: 2.1.13
\r
46 List-Id: "Use and development of the notmuch mail system."
\r
47 <notmuch.notmuchmail.org>
\r
48 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
50 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
51 List-Post: <mailto:notmuch@notmuchmail.org>
\r
52 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
53 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
55 X-List-Received-Date: Sun, 24 Aug 2014 20:07:54 -0000
\r
57 "W. Trevor King" <wking@tremily.us> writes:
\r
59 > On Tue, Aug 05, 2014 at 10:24:10PM -0300, David Bremner wrote:
\r
60 >> I have a local commit that deletes a couple tags; when I attempt to
\r
61 >> merge I get complaints about local changes to files.
\r
63 >> error: Your local changes to the following files would be overwritten by=
\r
65 >> tags/1406859003-11561-2-git-send-email-amdragon@mit.edu/needs-review
\r
66 >> tags/1406859003-11561-3-git-send-email-amdragon@mit.edu/needs-review
\r
67 >> Please, commit your changes or stash them before you can merge.
\r
69 >> Calling the perl version of nmbug successfully creates a little=20
\r
72 > The Perl version has:
\r
74 > git ( { GIT_WORK_TREE =3D> $tempwork }, 'checkout', '-f', 'HEAD');
\r
75 > git ( { GIT_WORK_TREE =3D> $tempwork }, 'merge', $commit);
\r
78 > But the Python version only has:
\r
81 > args=3D['merge', reference],
\r
82 > additional_env=3D{'GIT_WORK_TREE': workdir},
\r
85 > I suppose we need the checkout to populate the working directory, but
\r
86 > I'm not sure we want to force the checkout. Do we expect to have
\r
87 > unmerged entries in the index?
\r
89 I can't remember now why the checkout was forced, so as long as you can
\r
90 test it, I guess try the unforced version first. I guess the merge will
\r
91 fail if there are unmerged entries in the index, but maybe we can find
\r
92 out why that happens and prevent it.
\r