lp://staging/~gz/bzr/resolve_auto_refactor

Branch merges

Propose for merging

3 branches dependent on this one.

Ready for review for merging into lp://staging/bzr

bzr-core: Pending requested 2012-07-27

Diff: 243 lines (+58/-51)

3 files modified

bzrlib/conflicts.py (+36/-28)
bzrlib/tests/test_workingtree.py (+13/-6)
bzrlib/workingtree.py (+9/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #688506: "bzr help conflict-types" suggests incorrect "bzr resolve --auto" command line

Undecided

Confirmed

Link a bug report

Related blueprints

6547. By Martin Packman on 2012-07-27

Note issue over looking for conflict markers in a removed file

6546. By Martin Packman on 2012-07-27

Use tree.get_file rather than touching filesystem directly to auto resolve

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)