# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mirko.friedenhagen@1und1.de-20080507160637-\
#   pkvf5fe2leyma7zi
# target_branch: http://people.samba.org/bzr/jelmer/bzr-svn/0.4.9/
# testament_sha1: 1994a047ca01654900c2587f36a819c615eda425
# timestamp: 2008-05-07 18:06:43 +0200
# base_revision_id: jelmer@samba.org-20080324041102-i63thjooa5mbmlvh
# 
# Begin patch
=== modified file 'fileids.py'
--- fileids.py	2008-03-22 19:58:46 +0000
+++ fileids.py	2008-05-07 16:06:37 +0000
@@ -17,7 +17,7 @@
 
 from bzrlib import ui
 from bzrlib.errors import NotBranchError, RevisionNotPresent
-from bzrlib.knit import KnitVersionedFile
+from bzrlib.knit import make_file_knit
 from bzrlib.revision import NULL_REVISION
 from bzrlib.trace import mutter
 
@@ -141,7 +141,7 @@
 class CachingFileIdMap:
     """A file id map that uses a cache."""
     def __init__(self, cache_transport, actual):
-        self.idmap_knit = KnitVersionedFile("fileidmap-v%d" % FILEIDMAP_VERSION, cache_transport, create=True)
+        self.idmap_knit = make_file_knit("fileidmap-v%d" % FILEIDMAP_VERSION, cache_transport, create=True)
         self.actual = actual
         self.apply_changes = actual.apply_changes
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdduxDYAAXhfgAQQU2f//3cn
3QC///9wUAOa3e9Dt7gFKwSiJonop6eqbKNlNpHqGQHqANAZG0IGiJGnpqM1GnogaDQAAAAABkIT
Ip4pmp6noho0yNAA2oB6gAGUp6IDQPSaMgMgGQDJpoyNABJQmEBMTTTKYmmoxGmRpgmjTIGRbdrc
n+Vwx+IyK4oENCXRkziBCFyNRketJdXhMo15UCqRQDFFGpvqjFnGxU0aNNcyt26YbpflrOiJt6n2
okefUuu1XGKzUUaXyCEMSQlMFY+nCb6tzkIpwDuA6CxlK2kDkHpm6sgnGTXnnA+G4HOLzKkgLlSA
hASqylYg1gvnNAZA1MFEkBxi3kJhECBEaTWjBppOqsK0KicloHlakRNo0SqFFS1XhQ4ViAyhgXde
Z+KLRGV52pTqRRgCa+ipri8oHEyGBEsFFGBQGBsIhQK1l5IGqWogTKkaSKE0cSsoqP6mGFgWaqRW
mgtsLrReo1XRIxiKRWPGihqVuRoU48pbTZQJ3Ud1QD9RQWEtFZS9SImwrE6uTRGkc0nYKDHkE6w1
vxiNyJ4IY8GpcCoDIwskzwsCZdToFswWlBXpgLhwbK1hFEkC2XjTxM5RBFZiYgYOpQoPP1X41Xuo
pVn5e/9hrbMzX8bJXOk93O2UFi40VDKrK9GSMdcGYeDDw717egmdlc9RwCgCJ2zBoLIDzsnE1T9c
9JaPBhznSOWXA5kfQb9So67S+y4ZEh+pyCVHWPO8mWgemzE6Ow7UnAVYj0bC63w1aWCbiazZeK8b
Vr8O4w49hu3mNQ7zLXgwrNO0uuOBkB3wkHu9QpAyAf5piG6bdISyCocogPVInYWjsTeVizz2izKz
88OXoJHizfMHKlCnAPxzCW4twMwpAcOlkuIpBgN8lVkye9GdrFMBE2mRkgcYHvCz0zbNgB5caWIF
wN8dxDDXtYQ51xG0zFmzICs4CqVaD5Csjf2NDbigl3gJUWkqShaimAM+WBuacSLPz96QlsH3smNz
ByTAuIYJQCZjwJ+Aex0yeEGIYuaAiS24m+AHPQpkc4T8AYuROVFepl5jninnRENQncJqnvFwpUWm
GmtEnDJRcNrzYBJ+rHBUbIE0nTWiWAaIKyaGATEhjD7NXKnRGM1n7D23KgrAZBckk9HpC1BnRNTC
b8FLLPtiF5xSDhECRqQuQ0KNAxhbewmL5jqBpNgAfOplXcVVGBcNjPYw1gv4R/i7kinChIa7diGw