Comment 11 for bug 152008
Revision history for this message
| James Westby (james-w) wrote Re: [Bug 152008] [merge] document revert . and revert --forget-merges | #11 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
On (15/10/07 01:56), Martin Pool wrote:
> bzrlib/builtins.py'
> --- bzrlib/builtins.py 2007-10-02 08:21:43 +0000
> +++ bzrlib/builtins.py 2007-10-15 01:56:02 +0000
> @@ -3033,6 +3033,14 @@
> Any files that have been newly added since that revision will be deleted,
> with a backup kept if appropriate. Directories containing unknown files
> will not be deleted.
> +
> + The working tree contains a list of pending merged revisions, which will
> + be included as parents in the next commit. Normally, revert clears that
> + list as well as reverting the files. If any files, are specified, revert
> + leaves the pending merge list alnone and reverts only the files. Use "bzr
> + revert ." in the tree root to revert all files but keep the merge record,
> + and "bzr revert --forget-merges" to clear the pending merge list without
> + reverting any files.
> """
>
> Would that make it clearer? Is it too verbose?
>
Yes, I think that is good text to have in the help.
--
James Westby -- GPG Key ID: B577FE13 -- http://
seccure key - (3+)k7|