Date: Wed, 6 Aug 2014 16:38:03 -0700
From: "W. Trevor King" <wking@tremily.us>
To: David Bremner <bremner@debian.org>
Subject: Re: [PATCH v3] nmbug: Translate to Python
Message-ID: <20140806233803.GJ31313@odin.tremily.us>
References:
 <84447a0ed48412e1587761d560d18cb5affd4f66.1405897133.git.wking@tremily.us>
	<878un36bd5.fsf@maritornes.cs.unb.ca>	<871tsue7gl.fsf@maritornes.cs.unb.ca>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="j+MD90OnwjQyWNYt"
Content-Disposition: inline
In-Reply-To: <871tsue7gl.fsf@maritornes.cs.unb.ca>
OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;
	url=http://tremily.us/pubkey.txt
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: notmuch@notmuchmail.org
Precedence: list


--j+MD90OnwjQyWNYt
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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'll add an unforced checkout here in v4.  I'll add it to pull() too,
now that it's decoupled from nmbug's merge implementation.

Cheers,
Trevor

--=20
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

--j+MD90OnwjQyWNYt
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJT4rxaAAoJEG8/JgBt8ol89w4P/0mT2kW8JfYa6t8t+3YpY2rj
rHWfa6wv47LBKkL3QP0mQWlXC7WcMWRnQKQK+2CUXkxjlejd/TNeVZllXzvQWvfP
HH2ziwuOqFTI3OZK6tQy1mCn73YkLwkejXKhBY2JcNsEdpKJ7qx6rVyJvIC1S60o
flFS83fG4DNUTXDP/h5CCl3cd9WxTWct5yBvokv2nETfhjddn0N3sVKDGib6zdnK
i4e4FD1HQCmJnzG5dRLZ7qyLk7wo4C3L1kRM7mnznjCOU8yEWDA6OuAHMCPEnPug
6yjeIK2x1ltgIvEkxqpt3RTFnsK5Ue/RbcwVscUX/iVuiCcWyYAC4BatbWbTnigi
QpLTc6yYNQcyXnSQnNNZdHj0bAlJiuwT0JeahkNWHkXbeXRipSPQrjipwk3UHgWY
JolEP0gjucCmt1xTtjRaElkXRwekf1i/JKYGgxLK9ocY+6BN8YPXN3WI39VP0T9G
Lp1TauSVBojEXpl7DJyg2XYJdk2XPeZMs7QMDJ+/EkLmZV5Hpx7hV7mHKgiT3Y61
AoX+dq1fsyeqXQVKdkniTrMrSVrBJ9hXhc2RmP8+JbzIVfny1JmohYs3/272iK0V
jC+HMIhs/dKvFttKARnXl3keigluAh4bXWhh/xhQlDPc8e0gMIHxMzw6w3i0ICZ2
6PRVDjfUHDGuuIrkwZh/
=wW2K
-----END PGP SIGNATURE-----

--j+MD90OnwjQyWNYt--