|
518.
|
|
|
:Examples:
Re-do the merge of all conflicted files, and show the base text in
conflict regions, in addition to the usual THIS and OTHER texts::
|
|
|
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:4663
|
|
519.
|
|
|
bzr remerge --show-base
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4667
|
|
520.
|
|
|
Re-do the merge of "foobar", using the weave merge algorithm, with
additional processing to reduce the size of conflict regions::
|
|
|
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:4669
|
|
521.
|
|
|
bzr remerge --merge-type weave --reprocess foobar
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4672
|
|
522.
|
|
|
Show base revision text in conflicts.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4679
|
|
523.
|
|
|
Sorry, remerge only works after normal merges. Not cherrypicking or multi-merges.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4691
|
|
524.
|
|
|
Set files in the working tree back to the contents of a previous revision.
|
|
|
|
Вернуть файлы в рабочем дереве к содержанию предыдущей ревизии.
|
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4749
|
|
525.
|
|
|
Giving a list of files will revert only those files. Otherwise, all files
will be reverted. If the revision is not specified with '--revision', the
working tree basis revision is used. A revert operation affects only the
working tree, not any revision history like the branch and repository or
the working tree basis revision.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4751
|
|
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
|