lp:~vila/bzr/426344-check-pending-merges

Branch merges

Propose for merging

Merged into lp:bzr

John A Meinel: Approve on 2009-09-08

Diff: None lines api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #426344: pending merges are not viewed as tree changes

High

Fix Released

Link a bug report

Related blueprints

4676. By Vincent Ladeuil on 2009-09-08

Add NEWS entry.

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_uncommitted_changes,
TestMergeForce): Complete tests around --force including pending
merges.

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

4673. By Vincent Ladeuil on 2009-09-08

Cleanup imports in blackbox/test_merge.py.

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