[MERGE][136890] ``merge --uncommitted`` with a path to a specific file should merge only that file

[Lukáš Lalinský]

On Pi, 2007-09-07 at 07:29 -0400, Alexander Belchenko wrote:
> Alexander Belchenko has voted resubmit.
> Status is now: Resubmit
> Comment:
> You need to use #XXXXX for bug number, otherwise BundleBuggy will not 
> catch it.

Oh, I didn't know that.

> This line looks like typo:
> 
> +        self.failIfExists('b/file_ii')
> 
> Probably should be 'b/file_3'
> 
> Your test for specific files is not test that changes to other files is 
> ignored.

No, 'file_ii' is renamed in tree a from 'file_2' and in the line you
quoted it is testing that the file wasn't merged, because `merge a
--uncommited -d b` would merge this file as well. 

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/20070907/49f9b530/attachment.pgp