← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-14 08:21:19 UTC
  • mfrom: (3517.4.20 stacking)
  • Revision ID: pqm@pqm.ubuntu.com-20080714082119-ju6qe5weo8pp7f1c
merge integrated branch stacking

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
1368
1368
       ), out)
1369
1369
        self.assertEqual('', err)
1370
1370
        tree.unlock()
 
1371
 
 
1372
    def test_info_stacked(self):
 
1373
        # We have a mainline
 
1374
        trunk_tree = self.make_branch_and_tree('mainline',
 
1375
            format='development1')
 
1376
        trunk_tree.commit('mainline')
 
1377
        # and a branch from it which is stacked
 
1378
        new_dir = trunk_tree.bzrdir.sprout('newbranch', stacked=True)
 
1379
        out, err = self.run_bzr('info newbranch')
 
1380
        self.assertEqual(
 
1381
"""Standalone tree (format: development1)
 
1382
Location:
 
1383
  branch root: newbranch
 
1384
 
 
1385
Related branches:
 
1386
  parent branch: mainline
 
1387
     stacked on: mainline
 
1388
""", out)
 
1389
        self.assertEqual("", err)