Merge lp:~gz/bzr/resolve_dir_removal_auto_344013 into lp:bzr
|Diff against target:||
147 lines (+69/-7)
2 files modified
|To merge this branch:||bzr merge lp:~gz/bzr/resolve_dir_removal_auto_344013|
Description of the Change
Make automatic resolving treat conflicts involving deleted directories as resolved if the directory has been subsequently deleted.
There are two ways a user might do this:
* bzr rm dir
- In which case resolve can just remove the conflict. Bug 138803 wants rm to check for an clean up conflicts, that is not implemented here.
* rm -rf dir
- In which case I think having `bzr st` report missing files after resolve would be confusing, so the tree inventory needs updating.
When the desired outcome is that the directory should be kept, using --done is still needed.