← Back to branch summary

~bzr-loom-devs/bzr-loom/1.2

« back to all changes in this revision

Viewing changes to tests/blackbox.py

  • Committer: Robert Collins
  • Date: 2008-02-21 09:41:44 UTC
  • mfrom: (70.1.1 loom)
  • Revision ID: robertc@robertcollins.net-20080221094144-m89kfrtl4slcbyuc
Merge test-case bugfix from Aaron Bentley.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/blackbox.py
500
500
        # thread has merged the upper.
501
501
        LoomTreeDecorator(tree).down_thread()
502
502
        # ugh, should make merge easier to use.
503
 
        self.run_bzr(['merge', '-r', 'revid:above-vendor', '.'])
 
503
        self.run_bzr(['merge', '-r', 'thread:above-vendor', '.'])
504
504
        vendor_revid = tree.commit('merge in the above-vendor work.')
505
505
        LoomTreeDecorator(tree).up_thread()
506
506
        out, err = self.run_bzr(['combine-thread'])