Merge lp:~gz/bzr/resolve_auto_refactor into lp:bzr
|Diff against target:||
243 lines (+58/-51)
3 files modified
|To merge this branch:||bzr merge lp:~gz/bzr/resolve_auto_refactor|
Description of the Change
Creates a new kind of conflict resolution action named 'auto', refactoring code from `WorkingTree.
I'd like to write some specific tests for this action type, but can't really see a way in to bt.test_conflicts to do that.
Is there documentation other than in conflict-types.txt that this branch should update?
A followup branch will make `bzr resolve FILE` default to --auto rather than --done.
May also be a good idea to unify the --all switch and deprecate it.
I'm not wild about using NotImplementedError as the only mechanism of signalling a conflict as not having been resolved. Perhaps another exception type should be added for this?
The UI can benefit from some cleanup later, notably `bzr resolve` gives a return code if there are pending conflicts, and there are slightly different spellings of the results.
Having the pending conflicts returned by the auto_resolve method is actually a little useful. In general, conficts.resolve just returning the counts is fine, but to report the details having the conflict objects is handy.
- 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
- 6544. By Martin Packman on 2012-07-27
Refactor auto_resolve tree method into auto action on conflicts