From: David Bremner <bremner@debian.org>
To: "W. Trevor King" <wking@tremily.us>
Cc: notmuch@notmuchmail.org
Subject: Re: [PATCH v3] nmbug: Translate to Python
Date: Sun, 24 Aug 2014 13:07:43 -0700 [thread overview]
Message-ID: <874mx1ejn4.fsf@maritornes.cs.unb.ca> (raw)
In-Reply-To: <20140806233803.GJ31313@odin.tremily.us>
"W. Trevor King" <wking@tremily.us> 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.
>>
>> 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.
>> …
>> Calling the perl version of nmbug successfully creates a little
>> diamond merge
>
> The Perl version has:
>
> git ( { GIT_WORK_TREE => $tempwork }, 'checkout', '-f', 'HEAD');
> git ( { GIT_WORK_TREE => $tempwork }, 'merge', $commit);
>
> But the Python version only has:
>
> _git(
> args=['merge', reference],
> additional_env={'GIT_WORK_TREE': workdir},
> wait=True)
>
> 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
next prev parent reply other threads:[~2014-08-24 20:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-20 22:59 [PATCH v3] nmbug: Translate to Python W. Trevor King
2014-07-20 23:11 ` W. Trevor King
2014-07-20 23:34 ` W. Trevor King
2014-07-21 0:21 ` W. Trevor King
2014-08-05 0:14 ` David Bremner
2014-08-06 1:16 ` David Bremner
2014-08-06 23:28 ` W. Trevor King
2014-08-24 20:02 ` David Bremner
2014-08-06 1:24 ` David Bremner
2014-08-06 23:38 ` W. Trevor King
2014-08-24 20:07 ` David Bremner [this message]
2014-08-06 23:21 ` W. Trevor King
2014-08-24 20:39 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874mx1ejn4.fsf@maritornes.cs.unb.ca \
--to=bremner@debian.org \
--cc=notmuch@notmuchmail.org \
--cc=wking@tremily.us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).