/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2007-12-20 12:34:06 UTC
  • mfrom: (3133 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3134.
  • Revision ID: john@arbash-meinel.com-20071220123406-4ijq232s46ecsutz
[merge] bzr.dev 3133

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
60
60
        out, err = self.run_bzr('status')
61
61
        self.assertEquals(out, 'modified:\n  a\n')
62
62
 
 
63
    def test_uncommit_no_history(self):
 
64
        wt = self.make_branch_and_tree('tree')
 
65
        out, err = self.run_bzr('uncommit --force', retcode=1)
 
66
        self.assertEqual('', err)
 
67
        self.assertEqual('No revisions to uncommit.\n', out)
 
68
 
63
69
    def test_uncommit_checkout(self):
64
70
        wt = self.create_simple_tree()
65
71
        checkout_tree = wt.branch.create_checkout('checkout')
221
227
        out, err = self.run_bzr('uncommit --force -r 2')
222
228
 
223
229
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())
 
230
 
 
231
    def test_uncommit_nonascii(self):
 
232
        tree = self.make_branch_and_tree('tree')
 
233
        tree.commit(u'\u1234 message')
 
234
        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
 
235
        self.assertContainsRe(out, r'\? message')