Bazaar Version Control System

Comment 8 for bug 152008

On 10/13/07, Alexander Belchenko <email address hidden> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Christopher Armstrong пишет:
> > Alexander:
> >
> > Actually, the "bzr revert ." reverts all file changes but *keeps* the
> > merge information. That's the whole point of the trick.

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?

--
Martin