lp:~bialix/bzr/2.1-clean-tree-bzrdir

Branch merges

Merged into lp:bzr/2.1 at revision 4840

Vincent Ladeuil: Approve on 2010-05-05

Diff: 100 lines (+45/-0)

3 files modified

NEWS (+4/-0)
bzrlib/clean_tree.py (+25/-0)
bzrlib/tests/blackbox/test_clean_tree.py (+16/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #572098: `bzr clean-tree` should not blindly delete nested branch/tree/repo

High

Fix Released

Link a bug report

Related blueprints

4840. By Alexander Belchenko on 2010-05-04

backport to 2.1: ``bzr clean-tree`` should not delete nested bzrdirs. (bug #572098)

4839. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-30

(andrew) Fix AssertionError from _remember_remote_is_before when
 accessing smart servers running Bazaar < 1.6. (#528041)

4838. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-30

(andrew) Backport lp:bzr r5155: Reset siginterrupt flag everytime we
 handle a signal to partially workaround
 http://bugs.python.org/issue8354.

4837. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-29

(abentley) Fix switch with per-file mergers (#559436)

4836. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-23

(vila) Don't allow RemoteRepository to stack on an incompatible-format repository. (#562380) (Andrew Bennetts)

4835. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-23

(andrew) Fix example configuration in 'bzr help news_merge'. (#553161)

4834. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-22

(vila) Fix sphinx < 0.5 output dirs. (Michael Gliwinski)

4833. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-15

(vila) Remove bzr-2.1.2 section in NEWS,
 it's too early for that (and trigger spurious conflicts when merging
 in 2.2)

4832. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-15

(vila) Merge 2.0 into 2.1 including fixes for #262450, #373898,
 #498409

4831. By Canonical.com Patch Queue Manager <email address hidden> on 2010-03-24

(mbp) prepare 2.1.1