Rev 5084: (vila) Deprecate bzrlib.merge.Merge3Merger.scalar_three_way in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5084 [merge]
revision-id: pqm at pqm.ubuntu.com-20100311095645-31r1d2xx0ez23lku
parent: pqm at pqm.ubuntu.com-20100311091324-65tj2auj54teihjn
parent: v.ladeuil+lp at free.fr-20100311084746-71q85z64qtbse27k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-03-11 09:56:45 +0000
message:
  (vila) Deprecate bzrlib.merge.Merge3Merger.scalar_three_way
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
=== 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.