Created by Martin Packman and last modified
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

Martin Packman

Recent revisions

6549. By Martin Packman

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

6548. By Martin Packman

Make 'auto' the default in resolve_action_registry

6547. By Martin Packman

Update conflict-types help for change to resolve semantics

6546. By Martin Packman

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

6545. By Martin Packman

Deprecate WorkingTree.auto_resolve

6544. By Martin Packman

Refactor auto_resolve tree method into auto action on conflicts

6543. By Patch Queue Manager <email address hidden>

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

6542. By Patch Queue Manager <email address hidden>

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

6541. By Patch Queue Manager <email address hidden>

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

6540. By Patch Queue Manager <email address hidden>

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

Branch metadata

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