← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Aaron Bentley
  • Date: 2005-09-21 23:13:57 UTC
  • mto: (1185.1.37)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050921231357-2b7d37869d81c975
Fixed branch -r

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
220
220
        output = self.runbzr('diff -r last:3..last:1', backtick=1)
221
221
        self.assert_('\n+baz' in output)
222
222
 
 
223
    def test_branch(self):
 
224
        """Branch from one branch to another."""
 
225
        os.mkdir('a')
 
226
        os.chdir('a')
 
227
        self.example_branch()
 
228
        os.chdir('..')
 
229
        self.runbzr('branch a b')
 
230
        self.runbzr('branch a c -r 1')
 
231
 
223
232
    def test_merge(self):
224
233
        from bzrlib.branch import Branch
225
234