/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_workingtree/test_commit.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 12:37:04 UTC
  • mfrom: (6973.10.9 python3-i)
  • Revision ID: breezy.the.bot@gmail.com-20180630123704-jq2qazweqd3u5ssp
Add more bees.

Merged from https://code.launchpad.net/~jelmer/brz/python3-i/+merge/348244

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_commit.py
267
267
        if not wt.branch.repository._format.supports_ghosts:
268
268
            raise tests.TestNotApplicable(
269
269
                'format does not support ghosts')
270
 
        wt.set_parent_ids(['non:existent@rev--ision--0--2'],
 
270
        wt.set_parent_ids([b'non:existent@rev--ision--0--2'],
271
271
            allow_leftmost_as_ghost=True)
272
272
        rev_id = wt.commit('commit against a ghost first parent.')
273
273
        rev = wt.branch.repository.get_revision(rev_id)
274
 
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
 
274
        self.assertEqual(rev.parent_ids, [b'non:existent@rev--ision--0--2'])
275
275
        # parent_sha1s is not populated now, WTF. rbc 20051003
276
276
        self.assertEqual(len(rev.parent_sha1s), 0)
277
277
 
282
282
            raise tests.TestNotApplicable(
283
283
                'format does not support ghosts')
284
284
        wt.set_parent_ids([
285
 
                'foo@azkhazan-123123-abcabc',
286
 
                'wibble@fofof--20050401--1928390812',
 
285
                b'foo@azkhazan-123123-abcabc',
 
286
                b'wibble@fofof--20050401--1928390812',
287
287
            ],
288
288
            allow_leftmost_as_ghost=True)
289
289
        rev_id = wt.commit("commit from ghost base with one merge")
290
290
        # the revision should have been committed with two parents
291
291
        rev = wt.branch.repository.get_revision(rev_id)
292
 
        self.assertEqual(['foo@azkhazan-123123-abcabc',
293
 
            'wibble@fofof--20050401--1928390812'],
 
292
        self.assertEqual([b'foo@azkhazan-123123-abcabc',
 
293
            b'wibble@fofof--20050401--1928390812'],
294
294
            rev.parent_ids)
295
295
 
296
296
    def test_commit_deleted_subtree_and_files_updates_workingtree(self):