← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_push.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_push.py
251
251
        self.addCleanup(repo.lock_read().unlock)
252
252
        # We should have pushed 'C', but not 'B', since it isn't in the
253
253
        # ancestry
254
 
        self.assertEqual([('A',), ('C',)], sorted(repo.revisions.keys()))
 
254
        self.assertEqual(['A', 'C'], sorted(repo.all_revision_ids()))
255
255
 
256
256
    def test_push_with_default_stacking_does_not_create_broken_branch(self):
257
257
        """Pushing a new standalone branch works even when there's a default