/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_interbranch/test_pull.py

  • Committer: Vincent Ladeuil
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-01 01:20:50 UTC
  • mfrom: (6862.1.1 diverged-revids)
  • Revision ID: v.ladeuil+lp@free.fr-20180301012050-x69mya1j0l8r799h
Use unique messages for commits in diverged branches.

Merged from https://code.launchpad.net/~jelmer/brz/diverged-revids/+merge/340147

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_interbranch/test_pull.py
103
103
        tree_a = self.make_from_branch_and_tree('tree_a')
104
104
        tree_a.commit('message 1')
105
105
        tree_b = self.sprout_to(tree_a.controldir, 'tree_b').open_workingtree()
106
 
        rev2a = tree_a.commit('message 2')
107
 
        rev2b = tree_b.commit('message 2')
 
106
        rev2a = tree_a.commit('message 2a')
 
107
        rev2b = tree_b.commit('message 2b')
108
108
        self.assertRaises(errors.DivergedBranches, tree_a.pull, tree_b.branch)
109
109
        self.assertRaises(errors.DivergedBranches,
110
110
                          tree_a.branch.pull, tree_b.branch,