~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mutabletree.py

• browse files at revision 4988.10.5
• compare with another revision
• download diff
• download tarball
• view history from revision 4988.10.5

• reverse the comparison (4988.10.5 to 6351.2.2)
• stop comparing with revision 6351.2.2

Show diffs side-by-side

added

removed

bzrlib/tests/test_mutabletree.py

55

55

        self.assertTrue(self.tree.has_changes())

56

56

 

57

57

    def test_with_pending_merges(self):

58

 

        self.tree.commit('first commit')

59

58

        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()

60

 

        other_tree.commit('mergeable commit')

 

59

        self.build_tree(['other/file'])

 

60

        other_tree.add('file')

 

61

        other_tree.commit('added file')

61

62

        self.tree.merge_from_branch(other_tree.branch)

62

63

        self.assertTrue(self.tree.has_changes())

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1