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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-11 02:34:42 UTC
  • mfrom: (6681.2.10 more-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170611023442-p3vm7secrkqn6ckx
Some more bzrdir vs controldir fixes.

Merged from https://code.launchpad.net/~jelmer/brz/more-controldir/+merge/325453

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
3643
3643
            warnings.append(args[0] % args[1:])
3644
3644
        self.overrideAttr(trace, 'warning', warning)
3645
3645
        remaining_conflicts = resolve_conflicts(tt)
3646
 
        self.assertEqual(['dir/foo has been orphaned in bzr-orphans'],
 
3646
        self.assertEqual(['dir/foo has been orphaned in brz-orphans'],
3647
3647
                          warnings)
3648
3648
        # Yeah for resolved conflicts !
3649
3649
        self.assertLength(0, remaining_conflicts)
3650
3650
        # We have a new orphan
3651
3651
        self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
3652
 
        self.assertEqual('bzr-orphans',
 
3652
        self.assertEqual('brz-orphans',
3653
3653
                          tt.final_name(tt.final_parent(orphan_tid)))
3654
3654
 
3655
3655
    def test_never_orphan(self):