Rev 4978: Wrong deprecation caught by pqm. in file:///home/vila/src/bzr/bugs/log-tests-cleanup/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/log-tests-cleanup/

------------------------------------------------------------
revno: 4978
revision-id: v.ladeuil+lp at free.fr-20100123113740-0a324t1w36zecx59
parent: v.ladeuil+lp at free.fr-20100122143237-9mix42wxn7rabrru
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-tests-cleanup
timestamp: Sat 2010-01-23 12:37:40 +0100
message:
  Wrong deprecation caught by pqm.
  
  * bzrlib/log.py:
  (_rebase_merge_depth): Don't deprecate, it's *still* used !
-------------- next part --------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2010-01-22 11:15:30 +0000
+++ b/bzrlib/log.py	2010-01-23 11:37:40 +0000
@@ -698,7 +698,6 @@
     return _rebase_merge_depth(view_revisions)
 
 
- at deprecated_function(deprecated_in((2, 2, 0)))
 def _rebase_merge_depth(view_revisions):
     """Adjust depths upwards so the top level is 0."""
     # If either the first or last revision have a merge_depth of 0, we're done