← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-12 13:44:20 UTC
  • mfrom: (6358 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6362.
  • Revision ID: jelmer@samba.org-20111212134420-20130h4aa5ewp2m7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
78
78
        self.assertEqual('', out)
79
79
        self.assertEqual('Branched 2 revisions.\n', err)
80
80
        out, err = self.run_bzr('branches b')
81
 
        self.assertEqual(" orig\n thiswasa\n", out)
 
81
        self.assertEqual(" thiswasa\n orig\n", out)
82
82
        self.assertEqual('', err)
83
83
        out,err = self.run_bzr('branch a file:b,branch=orig', retcode=3)
84
84
        self.assertEqual('', out)