merge proposals in lp: question on diff metadata

[John Arbash Meinel]

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

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?
> 
> 

When I look at the page, it doesn't have the 'has conflicts' statement.

+1 line -1 line indicates that you probably modified one line. But
'diff' doesn't really know that. You could have added a completely
different line, and removed another line.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkty7rIACgkQJdeBCYSNAANylgCfTwA2FLzp7d2UtJFQMe7SBBVU
+XQAoJRvNsPzrvs57oEAnRvbmTIrCAyo
=uKo+
-----END PGP SIGNATURE-----