|
526.
|
|
|
To remove only some changes, without reverting to a prior version, use
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
will remove the changes introduced by the second last commit (-2), without
affecting the changes introduced by the last commit (-1). To remove
certain changes on a hunk-by-hunk basis, see the shelve command.
To update the branch to a specific revision or the latest revision and
update the working tree accordingly while preserving local changes, see the
update command.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4757
|
|
527.
|
|
|
Uncommitted changes to files that are reverted will be discarded.
Howver, by default, any files that have been manually changed will be
backed up first. (Files changed only by merge are not backed up.) Backup
files have '.~#~' appended to their name, where # is a number.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4766
|
|
530.
|
|
|
The working tree contains a list of revisions that have been merged but
not yet committed. These revisions will be included as additional parents
of the next commit. Normally, using revert clears that list as well as
reverting the files. If any files are specified, revert leaves the list
of uncommitted merges alone and reverts only the files. Use ``bzr revert
.`` in the tree root to revert all files but keep the recorded merges,
and ``bzr revert --forget-merges`` to clear the pending merge list without
reverting any files.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4743
|
|
531.
|
|
|
Using "bzr revert --forget-merges", it is possible to apply all of the
changes from a branch in a single revision. To do this, perform the merge
as desired. Then doing revert with the "--forget-merges" option will keep
the content of the tree as it was, but it will clear the list of pending
merges. The next commit will then contain all of the changes that are
present in the other branch, but without any other parent revisions.
Because this technique forgets where these changes originated, it may
cause additional conflicts on later merges involving the same source and
target branches.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4752
|
|
538.
|
|
|
To filter on a range of revisions, you can use the command -r begin..end
-r revision requests a specific revision, -r ..end or -r begin.. are
also valid.
:Exit values:
1 - some missing revisions
0 - no missing revisions
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4837
|
|
539.
|
|
|
Determine the missing revisions between this and the branch at the
remembered pull location::
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4847
|
|
541.
|
|
|
Determine the missing revisions between this and another branch::
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4852
|
|
543.
|
|
|
Determine the missing revisions up to a specific revision on the other
branch::
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4856
|
|
545.
|
|
|
Determine the missing revisions up to a specific revision on this
branch::
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4861
|
|
552.
|
|
|
Filter on other branch revisions (inclusive). See "help revisionspec" for details.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4882
|