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

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


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

Aaron Bentley wrote:
> Lukáa 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.

Here is an updated version that also credits Lukáš.

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

iD4DBQFHRyKJ0F+nu1YWqI0RAuAPAJ93+L9J4/b10Sm2Qnqh0YL04aMPQACXacfk
05GJ80RSQ1yEKf1sqtH+/g==
=O3Db
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-uncommitted-single.patch
Type: text/x-patch
Size: 5032 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071123/49ab5c74/attachment.bin 


More information about the bazaar mailing list