[Pkg-bazaar-commits] r21 ./bzr-hg/unstable: Merge trunk.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 21
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Thu 2007-12-06 15:44:26 +0100
message:
  Merge trunk.
modified:
  __init__.py
    ------------------------------------------------------------
    revno: 16.1.4.1.6.1.1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Tue 2007-11-13 03:58:03 +1100
    message:
      Merge Tim Hatch's demandimport disabling patch.
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 16.1.4.1.6.1.2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Tue 2007-11-13 04:08:29 +1100
    message:
      Add the recommend_upgrade parameter to open_workingtree for bzrlib compatibility.
    modified:
      __init__.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2007-08-11 18:18:27 +0000
+++ b/__init__.py	2007-12-06 14:44:26 +0000
@@ -585,7 +585,7 @@
         """'open' a repository for this dir."""
         return HgRepository(self._hgrepo, self, self._lockfiles)
 
-    def open_workingtree(self, shared=False):
+    def open_workingtree(self, shared=False, recommend_upgrade=False):
         """'open' a workingtree for this dir."""
         return HgWorkingTree(self._hgrepo, self, self._lockfiles)