/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 breezy/tests/per_branch/test_pull.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 00:39:16 UTC
  • mfrom: (6926 work)
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180325003916-mqa5uj4uq55hrjq9
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_pull.py
121
121
        tree_a = self.make_branch_and_tree('tree_a')
122
122
        tree_a.commit('message 1')
123
123
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
124
 
        rev2a = tree_a.commit('message 2')
125
 
        rev2b = tree_b.commit('message 2')
 
124
        rev2a = tree_a.commit('message 2a')
 
125
        rev2b = tree_b.commit('message 2b')
126
126
        self.assertRaises(errors.DivergedBranches, tree_a.pull, tree_b.branch)
127
127
        self.assertRaises(errors.DivergedBranches,
128
128
                          tree_a.branch.pull, tree_b.branch,