Rev 1134: Fix more issues, only left now is an encoding issue. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/cext

------------------------------------------------------------
revno: 1134
revision-id: jelmer at samba.org-20080825050007-yo3x8m3cdym2pmia
parent: jelmer at samba.org-20080825044215-l9uwr0u7347dz3pd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Mon 2008-08-25 07:00:07 +0200
message:
  Fix more issues, only left now is an encoding issue.
modified:
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'workingtree.py'
--- a/workingtree.py	2008-08-25 04:42:15 +0000
+++ b/workingtree.py	2008-08-25 05:00:07 +0000
@@ -408,7 +408,7 @@
                     continue
 
                 wc.process_committed(self.abspath(path).rstrip("/"), 
-                              False, entry.revision, 
+                              False, self.branch.lookup_revision_id(newrevtree.inventory[id].revision),
                               svn_revprops[properties.PROP_REVISION_DATE], 
                               svn_revprops[properties.PROP_REVISION_AUTHOR])
 
@@ -424,8 +424,8 @@
         # Set proper version for all files in the wc
         wc = self._get_wc(write_lock=True)
         try:
-            wc.process_committed(self.abspath("").rstrip("/"), 
-                          False, rev,
+            wc.process_committed(self.basedir,
+                          False, self.branch.lookup_revision_id(newrevtree.inventory.root.revision),
                           svn_revprops[properties.PROP_REVISION_DATE], 
                           svn_revprops[properties.PROP_REVISION_AUTHOR])
             update_settings(wc, "")