/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/test_missing.py

  • Committer: Marius Kruger
  • Date: 2009-01-25 01:03:47 UTC
  • mto: (3969.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3970.
  • Revision ID: amanic@gmail.com-20090125010347-qk0gt8kq6wtq6pt4
put spaces after commas

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
206
206
        tree2.merge_from_branch(tree3.branch)
207
207
        rev6 = tree2.commit('six', rev_id='rev6')
208
208
 
209
 
        self.assertUnmerged([], [('2', 'rev2', 0), ('3', 'rev3',0 ),
 
209
        self.assertUnmerged([], [('2', 'rev2', 0), ('3', 'rev3', 0),
210
210
                                 ('4', 'rev6', 0),
211
211
                                 ('3.1.1', 'rev4', 1), ('3.1.2', 'rev5', 1),
212
212
                                 ],
213
 
                            tree.branch, tree2.branch, 'all',
 
213
                            tree.branch, tree2.branch,
214
214
                            include_merges=True)
215
215
 
216
216
        self.assertUnmerged([], [('4', 'rev6', 0),
217
217
                                 ('3.1.2', 'rev5', 1), ('3.1.1', 'rev4', 1),
218
 
                                 ('3', 'rev3',0 ), ('2', 'rev2', 0),
 
218
                                 ('3', 'rev3', 0), ('2', 'rev2', 0),
219
219
                                 ],
220
 
                            tree.branch, tree2.branch, 'all',
 
220
                            tree.branch, tree2.branch,
221
221
                            include_merges=True,
222
222
                            backward=True)
223
223
 
224
224
        self.assertUnmerged([], [('4', 'rev6', 0)],
225
 
            tree.branch, tree2.branch, 'all',
 
225
            tree.branch, tree2.branch,
226
226
            include_merges=True, remote_revid_range=(rev6, rev6))
227
227
 
228
 
        self.assertUnmerged([], [('3', 'rev3',0 ), ('3.1.1', 'rev4', 1)],
229
 
                    tree.branch, tree2.branch, 'all',
 
228
        self.assertUnmerged([], [('3', 'rev3', 0), ('3.1.1', 'rev4', 1)],
 
229
                    tree.branch, tree2.branch,
230
230
                    include_merges=True, remote_revid_range=(rev3, rev4))
231
231
 
232
 
        self.assertUnmerged([], [('4', 'rev6', 0),('3.1.2', 'rev5', 1)],
233
 
                    tree.branch, tree2.branch, 'all',
 
232
        self.assertUnmerged([], [('4', 'rev6', 0), ('3.1.2', 'rev5', 1)],
 
233
                    tree.branch, tree2.branch,
234
234
                    include_merges=True, remote_revid_range=(rev5, rev6))
235
235
 
236
236
    def test_revision_range(self):