/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/commands/test_commit.py

  • Committer: Vincent Ladeuil
  • Date: 2009-09-08 16:45:11 UTC
  • mto: (4681.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4682.
  • Revision ID: v.ladeuil+lp@free.fr-20090908164511-5e7eupewxycwaue4
Don't allow remove-tree to succeed with pending merges unless
--force is used.

* bzrlib/tests/blackbox/test_remove_tree.py:
(TestRemoveTree.test_remove_tree_pending_merges,
TestRemoveTree.test_remove_tree_pending_merges_force): Test with
and without --force and pending merges.

* bzrlib/builtins.py:
(cmd_remove_tree.run): Check pending merges too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_commit.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
53
53
        # commit do not provide a directory parameter, we have to change dir
54
54
        # manually
55
55
        os.chdir('local')
56
 
        self.assertRaises(errors.BoundBranchOutOfDate, commit.run,
 
56
        # cmd_commit translates BoundBranchOutOfDate into BzrCommandError
 
57
        self.assertRaises(errors.BzrCommandError, commit.run,
57
58
                          message=u'empty commit', unchanged=True)
58
59
        self.assertEquals(1, len(self.connections))
59
60