[MERGE][Bug #5454] When two plugin commands conflict, both sources are now shown

[Daniel Watkins]

I was perusing the bug list and came across a patch from one Konstantin
Mikhaylov fixing this bug.  Attached is the patch with a NEWS item
addition.

-- 
Daniel Watkins (Odd_Bloke) <D.M.Watkins at warwick.ac.uk>
University of Warwick Christian Focus President
University of Warwick Computing Society WUGLUG Liaison Officer

-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: d.m.watkins at warwick.ac.uk-20070825160625-\
#   txoybrl7wji18ipw
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: 230e2f6ad205c4e5a1913504163f75636777c967
# timestamp: 2007-08-25 18:06:53 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20070824133750-r25v5g25g1flggy6
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2007-08-24 13:02:26 +0000
+++ NEWS	2007-08-25 16:06:25 +0000
@@ -36,6 +36,9 @@
     * patch verification for merge directives is reactivated, and works with
       CRLF and CR files.  (Aaron Bentley)
 
+    * When two plugins conflict, the source of both the losing and now the
+      winning definition is shown.  (Konstantin Mikhaylov, #5454)
+
   IMPROVEMENTS:
 
     * ``pull`` and ``merge`` are much faster at installing bundle format 4.

=== modified file 'bzrlib/commands.py'
--- bzrlib/commands.py	2007-08-15 04:33:34 +0000
+++ bzrlib/commands.py	2007-08-25 16:06:25 +0000
@@ -85,6 +85,8 @@
     else:
         trace.log_error('Two plugins defined the same command: %r' % k)
         trace.log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
+        trace.log_error('Previously this command was registered from %r' %
+                        sys.modules[plugin_cmds[k_unsquished].__module__])
 
 
 def _squish_command_name(cmd):

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVkhj2YAAjp/gFQQBABb9///
VgtIir////BQBRra3tAW7hrtgAISRRqZTIeptT01DMJNBkAMgDIAAlJqaAU9HpkSPUaB6jQeoAAM
gDIGiNE1NlE2jUGmj1P1GpkGTEyeiGQ0wQc0xMmTRhMExNMAmAQwRgRgEkgTQCZMoxoEIynpqbCm
0gAA8owoc4txcYTYzgKri6lTOLrIwJTohCKMAJIxcjkiaTIUAsr76tPxJLUvAmGZkzevovmO5EOP
MzOqHdTyHtmcZRmONgptEPivV7izEgrRjSI/IryhQpUjIgv2iAVKgeHyU0d2VVdK3y1geG9Kl5wA
rqnnQEVACzX6Gp1+1GGm28kefUBuYMQFl+QgZWJkAqVavPPCkQ0pVWBjyNhJ1mQMBiVhf3rp4irp
olSyjBT1kaieMYQTGIn30aTA0TRRAqiBSQQtychRTlJYRjz7U52m+5KalKGXI7kUUq461hMGcckC
uKVaXTgR8mfoxrAdUsClxyuOKw16lsEGJLNMVUGwvMgkAwFavUsrymo3U1I2Eyg/23VuxsdAhTMi
ipjCUU3CLloQqZikvLisyvNDM0sbUrFZSFpC0sKFQUlRdK5Su1DDEY5UtsuArhELUVD/Jfo6gCs/
I9XTMSTnlJAsMSleCZZbpvqQQ2nKwDU62LudwVkzbZkTKxwyE8YztjqJkZhfSMZl+41l4mKCIYgO
Cw23FbrELcW0VTKB5OJCt+rZgUlROSCD6WayWyF0CgcPSxwopUEY52psK8YrK8SsS8Dq+oIhzG73
EMLpYmVtBINsGN8DDET8REqNKtzLapZtRRoniT2EAkAYBj70OXtLRNPSG8x++4nkxpyVz/dbXy1/
a86XpyIuo9eiQePfAXM4jxhio8D37g7tSDr6uUaiZTkWHaYlKPPIHa22HWfW+Ja5L0ERXAcBy2Hj
bKZ2nifIyIG88TcdJGOsqu5AP+i7YHelQgrOBDncEeJoOqdMy3tFhDdnUF9jKJUUK8iDE2cunQbg
45IEAnHyF4V6c2h9ku2qWnzVVmcYzjJnHE9ImXIsCEPRxgd5dcHgY9i7r1BFxhac8X0xzxvOEli2
HTkWEEUSV7jDguEpIWJbQITINbXcWLulZSWFJcMRIoqiZdpjLSUatbadaI3y5YIn4BNMlmoqf9di
2GJvF4jxWv+Y8cYod7AcLeDsfFBA5ifQda/E4CebGMcEXXm2omWkqBkHrvprqrGA+PMDuiaQQV3G
d/RUZ4AT2lSBhDe3UbEYCPDjWGgEgmw0rlBjlDyyPM6se9WdiPdTAZdJatXwzvDz5ZD51roshSrq
FJVm0cD2DWFAPQz5sPF5w3jwdIcC6JFMRggwoJy6ajG8pHZtrSoSPm49iCXNtEarFreqjyMdytgT
KjtA88KcPZt+/QJK4XVIxx2VL6UldaYxA4KYst93+NocDim3QFngocsqkvfDvgYsn0UUgW1qzoI4
C4zUmC5A5cM2HuPh85VjSQPc/oNgWKeBWOQPJBnE3V1JiikXvd2Evl2QJ9Yak1zrQlqHJXu1jyZe
VCHTQy92UmCLKRwAgFa5LPdcu6CDSJptoV+AYN6JvjgukR68SIwu3ig6MAM0Dvf6gTOky/Dc8C5F
Ljbcnx4qJKFIFBgaRQpWj/F3JFOFCQWSGPZg
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070825/b5422cd7/attachment.pgp