/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_commit.py

  • Committer: John Arbash Meinel
  • Date: 2009-08-04 14:10:09 UTC
  • mfrom: (4585 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4588.
  • Revision ID: john@arbash-meinel.com-20090804141009-uety2n17v1atk5ok
Merge bzr.dev 4585, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_commit.py
611
611
        revid = tree.commit('first post')
612
612
        committed_tree = tree.basis_tree()
613
613
        self.assertTrue(committed_tree.has_filename("newfile"))
614
 
 
615
 
    def test_commit_and_mv_dance_a(self):
616
 
        # should fail because of
617
 
        # <https://bugs.launchpad.net/bzr/+bug/395556> but apparently does
618
 
        # not, while the blackbox.test_commit equivalent does - maybe because
619
 
        # of different format combinations
620
 
        tree = self.make_branch_and_tree(".")
621
 
        self.build_tree(["a"])
622
 
        tree.add("a")
623
 
        tree.rename_one("a", "b")
624
 
        tree.commit("Actually no, b")
625
 
        tree.rename_one("b", "a")
626
 
        tree.commit("No, really, a")
627
 
 
628
 
    def test_commit_and_mv_dance_b(self):
629
 
        # should fail because of
630
 
        # <https://bugs.launchpad.net/bzr/+bug/395556> but apparently does
631
 
        # not, while the blackbox.test_commit equivalent does - maybe because
632
 
        # of different format combinations
633
 
        tree = self.make_branch_and_tree(".")
634
 
        self.build_tree(["b"])
635
 
        tree.add("b")
636
 
        tree.rename_one("b", "a")
637
 
        tree.commit("Actually no, a")
638
 
        tree.rename_one("a", "b")
639
 
        tree.commit("No, really, b")