lp:~vila/bzr/426344-check-pending-merges
- Get this branch:
- bzr branch lp:~vila/bzr/426344-check-pending-merges
Branch merges
- John A Meinel: Approve on 2009-09-08
- Diff: None lines
Related bugs
Bug #426344: pending merges are not viewed as tree changes | High | Fix Released |
|
Related blueprints
Branch information
Recent revisions
- 4675. By Vincent Ladeuil on 2009-09-08
-
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. - 4674. By Vincent Ladeuil on 2009-09-08
-
Don't allow merge on top of pending merges without --force.
* bzrlib/
tests/blackbox/ test_merge. py:
(TestMergeForce.test_merge_ force,
TestMergeForce.test_merge_ with_uncommitte d_changes,
TestMergeForce): Complete tests around --force including pending
merges.* bzrlib/builtins.py:
(cmd_merge.run): Check pending merges too. - 4672. By Canonical.com Patch Queue Manager <email address hidden> on 2009-09-04
-
(robertc) Fix bug 402652: recompress badly packed groups during
fetch. (John Arbash Meinel, Robert Collins) - 4671. By Canonical.com Patch Queue Manager <email address hidden> on 2009-09-04
-
(robertc) Merge 2.0, includes EINTR support for bzr://,
and better stream representation with bzr:// streams. - 4670. By Canonical.com Patch Queue Manager <email address hidden> on 2009-09-03
-
(vila) Fix all known selftest leaks in /tmp
- 4669. By Canonical.com Patch Queue Manager <email address hidden> on 2009-09-03
-
(jam) Minor test suite speedup.
- 4668. By Canonical.com Patch Queue Manager <email address hidden> on 2009-09-03
-
(mbp) trivial corrections to progress bar style and developer docs
- 4667. By Canonical.com Patch Queue Manager <email address hidden> on 2009-09-02
-
(jam) Merge 2.0 4649 into bzr.dev
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr