|
|
517.
|
|
|
The options for remerge have the same meaning and defaults as the ones for 
merge. The difference is that remerge can (only) be run when there is a
pending merge, and it lets you specify particular files. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
remergeのオプションの意味とデフォルトはmergeと同じです。違いは、
remergeはマージ中状態のときだけ実行でき、特定のファイルを指定できる
ということです。 |
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4629
|
|
|
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.
|
|
|
|
|
:例:
すべての衝突したファイルのマージをやり直し、通常のTHIS、OTHERの
テキストにくわえて衝突した領域のベーステキストを表示します。:: |
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4633
|
|
|
519.
|
|
|
bzr remerge --show-base
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
bzr remerge --show-base
|
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:4637
|
|
|
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.
|
|
|
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
|
