← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests.py

  • Committer: Michael Ellerman
  • Date: 2005-11-28 06:58:01 UTC
  • mto: (0.3.1 shelf-dev) (325.1.2 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 334.
  • Revision ID: michael@ellerman.id.au-20051128065801-85aa3456f2b8e496
Shelve everything by default, use --pick to select hunks individually.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests.py
50
50
                self.DIFF_HEADER + self.DIFF_1 + '\n')
51
51
 
52
52
            # Shelve the changes
53
 
            self.run_bzr('shelve', '--all', retcode=True)
 
53
            self.run_bzr('shelve', retcode=True)
54
54
 
55
55
            # Make sure there is no diff anymore
56
56
            self.assertEqual(self.capture('diff', retcode=0), '')
83
83
        b.working_tree().commit(message='add test_file')
84
84
 
85
85
        # Shelve the changes
86
 
        self.run_bzr('shelve', '--all', retcode=True)
 
86
        self.run_bzr('shelve', retcode=True)
87
87
 
88
88
        if b._transport.has('.bzr/x-shelf/default/00'):
89
89
            self.fail("Shelf exists, but it shouldn't")
102
102
        b.working_tree().commit(message='update test_file')
103
103
 
104
104
        # Shelve the changes
105
 
        self.run_bzr('shelve', '-r', '1', '--all', retcode=True)
 
105
        self.run_bzr('shelve', '-r', '1', retcode=True)
106
106
 
107
107
        # Check the diff is right
108
108
        self.assertEqual(self.capture('diff', retcode=1),