/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: 2008-08-15 17:13:12 UTC
  • mto: This revision was merged to the branch mainline in revision 3638.
  • Revision ID: john@arbash-meinel.com-20080815171312-ny39eh0hc95j8ytd
Change to just display the command to restore the tip,
rather than showing the revision ids in the log display.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
218
218
 
219
219
        out, err = self.run_bzr('uncommit --force', working_dir='tree')
220
220
        self.assertContainsRe(out, r'second commit')
221
 
        self.assertContainsRe(out, r'revision-id:a2')
 
221
        self.assertContainsRe(err, r'You can restore the old tip by running')
 
222
        self.assertContainsRe(err, r'bzr pull . -r revid:a2')
222
223
 
223
224
    def test_uncommit_octopus_merge(self):
224
225
        # Check that uncommit keeps the pending merges in the same order