Merge upstream fixes.

diff --cc checkout.py
Simple merge

diff --cc repository.py
Simple merge

diff --cc tests/test_commit.py
index 7ae45e03dfa12210f29fd613d76fd5478ac05d4f,c45dd6e54ca9053ccde9b2a623fb7d02c4f5895c..fb30f43dd90fed07d124d3e029631655653b48a1
--- 1/tests/test_commit.py
--- 2/tests/test_commit.py
+++ b/tests/test_commit.py
@@@ -154,34 -151,17 +154,45 @@@ class TestCommitFromBazaar(TestCaseWith
          self.assertEqual("some-ghost-revision\n", 
                  self.client_get_prop(self.repos_url, "bzr:merge", 2))
  
 +    def test_commit_fileids(self):
 +        wt = self.checkout.create_workingtree()
 +        self.build_tree({'dc/file': 'data'})
 +        wt.add('file')
 +        wt.commit(message="Commit from Bzr")
 +        self.assertEqual("\t%s\nfile\t%s\n" % (wt.inventory.root.file_id, wt.inventory.path2id("file")), 
 +                self.client_get_prop(self.repos_url, "bzr:file-ids", 1))
 +
 +    def test_commit_fileids_added(self):
 +    
 +        rev = svn.core.svn_opt_revision_t()
 +        rev.kind = svn.core.svn_opt_revision_head
 +
 +        svn.client.checkout2(self.repos_url, "db", 
 +                rev, rev, True, False, self.client_ctx)
 +
 +        self.build_tree({'dc/file1': 'data', 'db/file2': "otherdata"})
 +        self.client_add("db/file2")
 +        self.client_commit("db", "amesg")
 +        branch = Branch.open(self.repos_url)
 +        inv = branch.repository.get_inventory(branch.last_revision())
 +        wt = self.checkout.create_workingtree()
 +        self.assertEqual(wt.inventory.root.file_id, inv.root.file_id)
 +        wt.add('file1')
 +        wt.commit(message="Commit from Bzr")
 +        self.assertEqual("file1\t%s\n" % wt.inventory.path2id("file1"), 
 +                self.client_get_prop(self.repos_url, "bzr:file-ids", 2))
 +
+     def test_commit_branchnick(self):
+         wt = self.checkout.create_workingtree()
+         self.build_tree({'dc/foo/bla': "data", 'dc/bla': "otherdata"})
+         wt.add('bla')
+         wt.commit(message="data")
+         wt.add('foo')
+         wt.add('foo/bla')
+         wt.commit(message="data", revprops={"branch-nick": "mybranch"})
+         self.assertEqual("mybranch", 
+                 self.client_get_prop(self.repos_url, "bzr:revprop:branch-nick", 2))
+ 
  class TestPush(TestCaseWithSubversionRepository):
      def setUp(self):
          super(TestPush, self).setUp()

diff --cc tests/test_repos.py
Simple merge

diff --cc tests/test_transport.py
Simple merge

diff --cc tests/test_workingtree.py
index dac359f29b2ad0ed71cf2531fec4212748b823a2,960742a1cc82f5d0a151f623f5807ea8bb406b3b..031874e03faec8660e26fa935d6398bc1d49bf9b
--- 1/tests/test_workingtree.py
--- 2/tests/test_workingtree.py
+++ b/tests/test_workingtree.py
@@@ -114,13 -114,13 +114,13 @@@ class TestWorkingTree(TestCaseWithSubve
          self.assertIs(None, basis_inv.path2id("bloe"))
  
      def test_empty_basis_tree(self):
-         self.make_client_and_bzrdir('a', 'dc')
+         self.make_client('a', 'dc')
          wt = WorkingTree.open("dc")
          self.assertEqual(NULL_REVISION, wt.basis_tree().inventory.revision_id)
 -        self.assertEqual(Inventory(), wt.basis_tree().inventory)
 +        self.assertEqual(Inventory(root_id=None), wt.basis_tree().inventory)
  
      def test_basis_tree(self):
-         self.make_client_and_bzrdir('a', 'dc')
+         self.make_client('a', 'dc')
          self.build_tree({"dc/bl": "data"})
          self.client_add("dc/bl")
          self.client_commit("dc", "Bla")

diff --cc tree.py
Simple merge