|
|
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.
|
|
|
|
|
"foobar"のマージを、weaveマージアルゴリズムでやりなおし、衝突領域の
縮小化処理も行います。::
|
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4639
|
|
|
521.
|
|
|
bzr remerge --merge-type weave --reprocess foobar
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
bzr remerge --merge-type weave --reprocess foobar
|
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4642
|
|
|
522.
|
|
|
Show base revision text in conflicts.
|
|
|
|
|
衝突したベースリビジョンのテキストを表示します。
|
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4649
|
|
|
523.
|
|
|
Sorry, remerge only works after normal merges. Not cherrypicking or multi-merges.
|
|
|
|
|
remergeは通常のマージ後にだけ実行できます。チェリーピックや複数マージでは
利用できません。 |
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4661
|
|
|
524.
|
|
|
Set files in the working tree back to the contents of a previous revision.
|
|
|
|
|
(no translation yet)
|
|
|
|
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
|
|
|
528.
|
|
|
When you provide files, you can use their current pathname or the pathname
from the target revision. So you can use revert to "undelete" a file by
name. If you name a directory, all the contents of that directory will be
reverted. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
ファイル名を指定するときは、現在のファイル名か、対象リビジョン時点でのファイル
名かを使うことができます。つまり、ファイル名指定で「削除の取り消し」のために
revertを使うことができます。ディレクトリを指定した場合は、その配下のすべての
変更が取り消されます。 |
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4733
|
|
|
529.
|
|
|
If you have newly added files since the target revision, they will be
removed. If the files to be removed have been changed, backups will be
created as above. Directories containing unknown files will not be
deleted. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
対象のリビジョン以降にファイルが新しく追加されている場合は、そのファイルは
削除されます。削除されるファイルが変更されている場合は、上記の通りに
バックアップされます。バージョン管理外のファイルを含むディレクトリは削除され
ません。 |
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4738
|
