[MERGE] merge --uncommit can now specify single files (#136890)

Aaron Bentley aaron.bentley at utoronto.ca
Fri Nov 23 18:13:41 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Lukáš Lalinský wrote:
> On Pi, 2007-11-23 at 12:45 -0500, Aaron Bentley wrote:
>> This patch allows merge --uncommitted to operate on a single file.  It
>> fixes bug #136890 (marked 'High'), and I believe it's suitable for 1.0
> 
> It's funny that when I sent a patch for this about three months ago, you
> voted resubmit with a note that it should be fixed in
> Merger.from_uncommitted and now you are sending identical patch
> yourself.

I very nearly did submit a patch that fixed it in
Merger.from_uncommitted, but then I looked at the other factory methods,
and realized that none of them handled it that way, so I went for
consistency.

I'm sorry if I seem hypocritical.  Clearly, my earlier review was wrong.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHRxhV0F+nu1YWqI0RAlT7AJ4+Vsa55KxNPZiXP/xAkDKGq5DAegCdH+du
5xynUa+IlXnK8GJAQrmaJL0=
=omku
-----END PGP SIGNATURE-----



More information about the bazaar mailing list