merge proposals in lp: question on diff metadata

[Francis J. Lacoste]

On February 10, 2010, Alexander Belchenko wrote:
> The merge proposal
> https://code.launchpad.net/~smartgpx/bzr-explorer/fix-519757/+merge/18994
> 
> has this line in the header:
> 
> Diff against target:       10 lines (+1/-1) 1 file modified (has conflicts)
> 
> It seems like pretty new feature?
> 
> What it means? There is actually only 1 line modified and no conflicts.
> Why it tells about conflicts?
> 

The "has conflicts" thing is a bug: 

https://bugs.launchpad.net/launchpad-code/+bug/515775

The fix be rolled-out at the end of the month.

-- 
Francis J. Lacoste
francis.lacoste at canonical.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100210/b6877f8a/attachment-0001.pgp