Rev 1692: Fix pull into subversion working copies. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1692
revision-id: jelmer at samba.org-20080831231630-2ofs47zet20wdhkc
parent: jelmer at samba.org-20080831193939-8iirm9frsmq29c95
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-09-01 01:16:30 +0200
message:
  Fix pull into subversion working copies.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'NEWS'
--- a/NEWS	2008-08-31 19:39:39 +0000
+++ b/NEWS	2008-08-31 23:16:30 +0000
@@ -24,6 +24,8 @@
    * Fix size of bool variable in replacement stdbool.h. This was 
      causing strange errors on Windows, most notably slow fetches.
 
+   * Fix pull into Subversion working copies.
+
   FEATURES
 
    * Use native Windows password prompter on Windows. (#263287)

=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py	2008-08-25 02:03:39 +0000
+++ b/tests/test_workingtree.py	2008-08-31 23:16:30 +0000
@@ -346,6 +346,18 @@
         tree.basis_tree()
         delta = tree.changes_from(tree.basis_tree())
         self.assertEqual("bl", delta.modified[0][0])
+
+    def test_pull(self):
+        repos_url = self.make_client('a', 'dc')
+
+        dc = self.get_commit_editor(repos_url)
+        dc.add_dir("bar")
+        dc.close()
+
+        tree = WorkingTree.open("dc")
+        br = Branch.open(repos_url)
+        tree.pull(br)
+        self.assertEquals(tree.last_revision(), br.last_revision())
  
     def test_working_inventory(self):
         self.make_client('a', 'dc')

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-08-31 11:34:41 +0000
+++ b/workingtree.py	2008-08-31 23:16:30 +0000
@@ -592,7 +592,7 @@
         if stop_revision is None:
             stop_revision = self.branch.last_revision()
         revnumber = self.branch.lookup_revision_id(stop_revision)
-        fetched = self._update(revnumbe)
+        fetched = self._update(revnumber)
         self.base_revnum = fetched
         self.base_revid = self.branch.generate_revision_id(fetched)
         self.base_tree = None