lp:~gz/bzr/resolve_file_not_done

Created by Martin Packman on 2012-07-27 and last modified on 2012-07-27
Get this branch:
bzr branch lp:~gz/bzr/resolve_file_not_done
Only Martin Packman can upload to this branch. If you are Martin Packman please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Martin Packman
Project:
Bazaar
Status:
Development

Recent revisions

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)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:bzr
This branch contains Public information 
Everyone can see this information.

Subscribers