|
|
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.
|
|
|
Revert files to a previous revision.
|
|
|
|
|
ファイルを過去のリビジョンに戻します。
|
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4717
|
|
|
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
last committed revision is used. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
ファイルのリストを指定すると、そのファイルだけが元に戻されます。
そうでない場合は、全てのファイルが対象になります。--revisionで
リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用
されます。 |
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4719
|
|
|
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. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
以前のリビジョンに戻さずにいくつかの変更を取り除くには、mergeをかわりに
使用します。例えば、"merge . -r -2..-3" (.を忘れないように)で、最終リビジョン
(-1)での変更はそのままで、その一つ前のリビジョン(-2)での変更だけを取り
除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧
ください。 |
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4723
|
|
|
527.
|
|
|
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.
|
|
|
|
|
デフォルトでは、手で変更されたファイルは最初にバックアップされます。(merge
コマンドで変更されただけのファイルはバックアップされません)バックアップ
ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。 |
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4729
|
|
|
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
|
|
|
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
|
|
|
532.
|
|
|
Do not save backups of reverted files.
|
|
|
|
|
リバートされたファイルのバックアップを作成しない。
|
|
Translated and reviewed by
epii
|
|
|
|
Located in
bzrlib/builtins.py:4766
|
