Merge lp://qastaging/~gz/bzr/resolve_dir_removal_auto_344013 into lp://qastaging/bzr
Proposed by
Martin Packman
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~gz/bzr/resolve_dir_removal_auto_344013 |
| Merge into: | lp://qastaging/bzr |
| Prerequisite: | lp://qastaging/~gz/bzr/resolve_auto_refactor |
| Diff against target: |
147 lines (+69/-7) 2 files modified
bzrlib/conflicts.py (+25/-0) bzrlib/tests/test_conflicts.py (+44/-7) |
| To merge this branch: | bzr merge lp://qastaging/~gz/bzr/resolve_dir_removal_auto_344013 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| bzr-core | Pending | ||
|
Review via email:
|
|||
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.
To post a comment you must log in.
Unmerged revisions
- 6546. By Martin Packman
-
Resolve directory deletion conflicts if the dir has been removed
- 6545. By Martin Packman
-
Deprecate WorkingTree.
auto_resolve - 6544. By Martin Packman
-
Refactor auto_resolve tree method into auto action on conflicts
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
