← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to testbzr

  • Committer: Martin Pool
  • Date: 2005-06-06 11:53:29 UTC
  • Revision ID: mbp@sourcefrog.net-20050606115329-1596352add25bffd
- merge aaron's updated merge/pull code

Show diffs side-by-side

added added

removed removed

Lines of Context:
testbzr
353
353
 
354
354
    cd('..')
355
355
    cd('..')
 
356
    progress('branch')
 
357
    # Can't create a branch if it already exists
 
358
    runcmd('bzr branch branch1', retcode=1)
 
359
    # Can't create a branch if its parent doesn't exist
 
360
    runcmd('bzr branch /unlikely/to/exist', retcode=1)
 
361
    runcmd('bzr branch branch1 branch2')
 
362
 
 
363
    progress("pull")
 
364
    cd('branch1')
 
365
    runcmd('bzr pull', retcode=1)
 
366
    runcmd('bzr pull ../branch2')
 
367
    cd('.bzr')
 
368
    runcmd('bzr pull')
 
369
    runcmd('bzr commit -m empty')
 
370
    runcmd('bzr pull')
 
371
    cd('../../branch2')
 
372
    runcmd('bzr pull')
 
373
    runcmd('bzr commit -m empty')
 
374
    cd('../branch1')
 
375
    runcmd('bzr commit -m empty')
 
376
    runcmd('bzr pull', retcode=1)
 
377
    cd ('..')
356
378
 
357
379
    progress('status after remove')
358
380
    mkdir('status-after-remove')