[MERGE][136890] ``merge --uncommitted`` with a path to a specific file should merge only that file
Lukáš Lalinský
lalinsky at gmail.com
Sat Sep 15 09:16:12 BST 2007
On Št, 2007-09-13 at 14:41 -0400, Aaron Bentley wrote:
> Aaron Bentley has voted resubmit.
> Status is now: Resubmit
> Comment:
> Please put the fix into Merger.from_uncommitted. It's cleaner that way.
I actually had it this way, but moved it to cmd_merge, because I've
noticed that also the code for setting interesting_files in case of
committed changes is there. Should I move it Merger.from_revision_ids?
Lukas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Toto je =?ISO-8859-1?Q?digit=E1lne?=
=?ISO-8859-1?Q?_podp=EDsan=E1?= =?UTF-8?Q?_=C4=8Das=C5=A5?=
=?ISO-8859-1?Q?_spr=E1vy?=
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070915/8a2eec06/attachment.pgp
More information about the bazaar
mailing list