Merge lp:~gz/bzr/resolve_file_not_done into lp:bzr
|Diff against target:||
171 lines (+30/-21)
3 files modified
|To merge this branch:||bzr merge lp:~gz/bzr/resolve_file_not_done|
Description of the Change
Makes `bzr resolve FILE` use the same auto logic as `bzr resolve` rather than implying `bzr resolve --done FILE`.
This was discussed on the mailing list recently:
Currently auto is pretty limited, which makes this change less appetizing, for deleted directories and such like I often end up running resolve with single argument quite often, and having to remember --done now could get frustrating. However, it's pretty obvious if you know about the change, and making auto smarter is something we've wanted for a while anyway.
I've updated some bits of documentation but am probably missing other bits elsewhere.
The current testing for conflicts I don't fully understand, some help explaining the details there would be good, but it appears that several places where I needed to add --done should get covered by making --auto smarter.
- 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_
- 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
- 6544. By Martin Packman on 2012-07-27
Refactor auto_resolve tree method into auto action on conflicts