~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Vincent Ladeuil
  • Date: 2009-06-26 18:13:41 UTC
  • mto: (4498.2.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4501.
  • Revision ID: v.ladeuil+lp@free.fr-20090626181341-grhq7i0h0gv7xlcb
Fix bug #206577 by adding a --strict option to send.

* bzrlib/tests/blackbox/test_send.py:
(load_tests): Test send --strict for uncommitted changes and
pending merges.
(TestSendBase): Factor out some common helpers.
(TestSendStrict): Helpers for --strict option tests.
(TestSendStrictWithoutChanges, TestSendStrictWithChanges): Test
the --strict option.

* bzrlib/send.py:
(send): Handle the strict option.

* bzrlib/help_topics/en/configuration.txt:
(send_strict): Document.

* bzrlib/builtins.py:
(cmd_send): Add a '--strict' option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
13
13
************
14
14
 
15
15
* ``bzr push`` now checks if uncommitted changes are present in the working
16
 
  tree if the ``--strict`` option is used.
 
16
  tree if the ``--strict`` option is used. The ``push_strict`` option can
 
17
  be declared in a configuration file.
17
18
  (Vincent Ladeuil, #284038)
18
19
 
 
20
* ``bzr send`` now aborts if uncommitted changes (including pending merges)
 
21
  are present in the working tree and no revision is speficied. The
 
22
  ``--no-strict`` option can be used to force the sending. The
 
23
  ``send_strict`` option can be declared in a configuration file.
 
24
  (Vincent Ladeuil, #206577)
 
25
 
19
26
 
20
27
Bug Fixes
21
28
*********