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

Created by Martin Packman and last modified
Get this branch:
bzr branch lp://staging/~gz/bzr/resolve_auto_refactor
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

6547. By Martin Packman

Note issue over looking for conflict markers in a removed file

6546. By Martin Packman

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

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
 Bentley)

6539. By Patch Queue Manager <email address hidden>

(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>

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

Branch metadata

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

Subscribers