Rev 5078: Deprecate Merge3Merger.scalar_three_way. in file:///home/vila/src/bzr/cleanup/various/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/cleanup/various/

------------------------------------------------------------
revno: 5078
revision-id: v.ladeuil+lp at free.fr-20100309153325-w16djg6tbkt0905a
parent: pqm at pqm.ubuntu.com-20100308054919-m9xwgjimj2fz97j0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: various
timestamp: Tue 2010-03-09 16:33:25 +0100
message:
  Deprecate Merge3Merger.scalar_three_way.
  
  * bzrlib/merge.py:
  (Merge3Merger.scalar_three_way): Deprecated, not used in the
  current code base, skimming history seem to reveal it hasn't been
  used for quite a long time.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2010-02-23 07:43:11 +0000
+++ b/bzrlib/merge.py	2010-03-09 15:33:25 +0000
@@ -1173,6 +1173,7 @@
         return 'conflict'
 
     @staticmethod
+    @deprecated_method(deprecated_in((2, 2, 0)))
     def scalar_three_way(this_tree, base_tree, other_tree, file_id, key):
         """Do a three-way test on a scalar.
         Return "this", "other" or "conflict", depending whether a value wins.