Merge lp:~jelmer/bzr/tweak-revert-help into lp:bzr
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6514 |
Proposed branch: | lp:~jelmer/bzr/tweak-revert-help |
Merge into: | lp:bzr |
Diff against target: |
37 lines (+12/-5) 1 file modified
bzrlib/builtins.py (+12/-5) |
To merge this branch: | bzr merge lp:~jelmer/bzr/tweak-revert-help |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+99141@code.launchpad.net |
Commit message
Tweak the help string for 'bzr revert'.
Description of the change
This tweaks the help text of 'bzr revert' a bit, as discussed on the mailing list.
See https:/
To post a comment you must log in.
Thanks for that.
As discussed on the list, defining the command as "revert files ..." is a bit circular, so perhaps it's better to say something like "set files in the working tree" or something.
To remove only some changes, without reverting to a prior version, use merge instead.
Perhaps that should be made more clear that revert will normally discard any uncommitted changes.
Rather than 'last committed revision' we should probably say 'working tree basis revision', which is more accurate, and we should probably mention this never changes the basis revision.
Perhaps we should contrast revert to 'update', which carries uncommitted changes, which goes to the branch tip revision by default, and which does change the basis revision.