← Back to branch summary

~ubuntu-branches/ubuntu/quantal/bzr-svn/quantal

« back to all changes in this revision

Viewing changes to tests/test_push.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2008-11-10 02:31:45 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20081110023145-h7vtophkjmcajp9g
Tags: 0.4.15-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_push.py
617
617
        wt1.branch.push(Branch.open(repos_url+"/trunk"))
618
618
        r = Repository.open(repos_url)
619
619
        props = r.branchprop_list.get_changed_properties("trunk", 3)
620
 
        self.assertEquals(props['bzr:text-parents'], 'bar2.txt\tside1\n')
 
620
        self.assertEquals(props['bzr:text-revisions'][1], 'bar2.txt\tside1\n')
621
621
 
622
622
        os.mkdir("cpy")
623
623
        cpy = BzrDir.create("cpy", format.get_rich_root_format())
695
695
        self.assertEquals(u"Do á commït",
696
696
                Repository.open(repos_url).get_revision(revid1).message)
697
697
 
 
698
    def test_kind_change_file_to_directory(self):
 
699
        repos_url = self.make_repository("a")
 
700
        bzrwt = BzrDir.create_standalone_workingtree("c", 
 
701
            format=format.get_rich_root_format())
 
702
        self.build_tree({'c/foo.txt': "foo"})
 
703
        bzrwt.add("foo.txt")
 
704
        revid1 = bzrwt.commit(u"somecommit")
 
705
        os.remove("c/foo.txt")
 
706
        self.build_tree({"c/foo.txt/bar": "contents"})
 
707
        bzrwt.add("foo.txt")
 
708
        revid2 = bzrwt.commit(u"somecommit")
 
709
        newdir = BzrDir.open(repos_url+"/trunk")
 
710
        newdir.import_branch(bzrwt.branch)
 
711
 
698
712
    def test_multiple_part_exists(self):
699
713
        repos_url = self.make_repository("a")
700
714