lp:~gz/bzr/resolve_dir_removal_auto_344013

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:bzr

bzr-core: Pending requested 2012-07-27

Diff: 147 lines (+69/-7)

2 files modified

bzrlib/conflicts.py (+25/-0)
bzrlib/tests/test_conflicts.py (+44/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #344013: bzr resolve should automatically resolve conflicted directory deletion

High

In Progress

Link a bug report

Related blueprints

6546. By Martin Packman on 2012-07-27

Resolve directory deletion conflicts if the dir has been removed

6545. By Martin Packman on 2012-07-27

Deprecate WorkingTree.auto_resolve

6544. By Martin Packman on 2012-07-27

Refactor auto_resolve tree method into auto action on conflicts

6543. By Patch Queue Manager <email address hidden> on 2012-07-25

(jelmer) Suggest running 'bzr reconcile --canonicalize-chks' when hitting
 missing chk root reference errors. (Jelmer Vernooij)

6542. By Patch Queue Manager <email address hidden> on 2012-07-24

(jelmer) Only read the first line from /etc/mailname. (Haw Loeung)

6541. By Patch Queue Manager <email address hidden> on 2012-07-23

(abentley) lp-find-proposal now ignores branch. (Aaron Bentley)

6540. By Patch Queue Manager <email address hidden> on 2012-07-23

(abentley) switch --store stores uncommitted changes in branch (Aaron
 Bentley)

6539. By Patch Queue Manager <email address hidden> on 2012-07-20

(jelmer) Add two more topics to the ``See also`` part of 'bzr help
 checkout'. (Wouter van Heyst)

6538. By Patch Queue Manager <email address hidden> on 2012-07-11

(vila) Tweak release manager notes. (Vincent Ladeuil)

6537. By Patch Queue Manager <email address hidden> on 2012-07-10

(vila) Open 2.6b3 (Vincent Ladeuil)