Merge lp:~gz/bzr/resolve_file_not_done into lp:bzr
Status: | Needs review |
---|---|
Proposed branch: | lp:~gz/bzr/resolve_file_not_done |
Merge into: | lp:bzr |
Prerequisite: | lp:~gz/bzr/resolve_auto_refactor |
Diff against target: |
171 lines (+30/-21) 3 files modified
bzrlib/conflicts.py (+5/-7) bzrlib/help_topics/en/conflict-types.txt (+4/-3) bzrlib/tests/test_conflicts.py (+21/-11) |
To merge this branch: | bzr merge lp:~gz/bzr/resolve_file_not_done |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
bzr-core | 2012-07-27 | Pending | |
Review via email:
|
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:
<https:/
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.
Aaron Bentley (abentley) wrote : | # |
Martin Packman (gz) wrote : | # |
> I think that the existing behaviour makes sense, and the proposed changes just
> cause users to do more typing.
I agree, the extra typing is bad.
My aim with this group of branches is to actually not change what you have to type. This branch makes it harder to just discard conflicts, in others I want to make detection of resolved conflicts actually work for more cases. So, in the end you'll still be doing some action to resolve a conflict, then `bzr resolve FILE`.. or just `bzr resolve`.
> Why have you removed documentation of --all at 19?
Should have left that for another branch really but, in short, `bzr resolve --all` is functionally equivalent to `bzr resolve --done`, which is a more dangerous operation than we want to recommend in the help text.
People should be using `bzr resolve` followed by `bzr resolve --done FILE` if the auto resolution fails for something in particular. Generalising to the no-arg form for all files is easy to understand from there for when it's actually useful.
Unmerged revisions
- 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_
action_ registry - 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
-
Deprecate WorkingTree.
auto_resolve - 6544. By Martin Packman on 2012-07-27
-
Refactor auto_resolve tree method into auto action on conflicts
I think that the existing behaviour makes sense, and the proposed changes just cause users to do more typing.
They encourage users to use "resolve FILE" when bzr doesn't need an argument, and they force users to specify --done when they actually do need to specify an argument.
Why have you removed documentation of --all at 19?