lp:~gz/bzr/resolve_file_not_done

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: 171 lines (+30/-21)

3 files modified

bzrlib/conflicts.py (+5/-7)
bzrlib/help_topics/en/conflict-types.txt (+4/-3)
bzrlib/tests/test_conflicts.py (+21/-11)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6549. By Martin Packman on 2012-07-27

Note in cmd_resolve help that --done is needed, and remove mention of --all

6548. By Martin Packman on 2012-07-27

Make 'auto' the default in resolve_action_registry

6547. By Martin Packman on 2012-07-27

Update conflict-types help for change to resolve semantics

6546. By Martin Packman on 2012-07-27

Make resolving with a list of files default to action auto rather than done

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)