~ubuntu-branches/ubuntu/gutsy/bzr/gutsy

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Etienne Goyer
  • Date: 2007-04-27 17:53:49 UTC
  • mfrom: (1.1.23 upstream)
  • Revision ID: james.westby@ubuntu.com-20070427175349-rvowqx994rfuikuu
Tags: 0.16~rc1-0ubuntu1
New upstream development release 

Show diffs side-by-side

added added

removed removed

Lines of Context:
434
434
        runbzr("help slartibartfast", 3)
435
435
 
436
436
        out = capture("help ci")
437
 
        out.index('aliases: ')
 
437
        out.index('aliases:\n')
438
438
 
439
439
        f = file('hello.txt', 'wt')
440
440
        f.write('some nice new content\n')
522
522
            self.assertEquals(self.capture("relpath d2/link1"), "d2/link1\n")
523
523
            runbzr(['commit', '-m', '4: retarget of two links'])
524
524
    
525
 
            runbzr('remove d2/link1')
 
525
            runbzr('remove --keep d2/link1')
526
526
            self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
527
527
            runbzr(['commit', '-m', '5: remove d2/link1'])
528
528
            # try with the rm alias
529
529
            runbzr('add d2/link1')
530
530
            runbzr(['commit', '-m', '6: add d2/link1'])
531
 
            runbzr('rm d2/link1')
 
531
            runbzr('rm --keep d2/link1')
532
532
            self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
533
533
            runbzr(['commit', '-m', '7: remove d2/link1'])
534
534