| 38 | | * ''インライン'' スタイルでは、2つのファイルを重ねて、変更があった行だけを表示します。ファイルから削除された行は赤に、追加された行は緑に着色されます。変更された行は古いリビジョン、新しいリビジョンの順で表示します。左側の行番号は古いリビジョンと、新しいリビジョンの両方で、変更を行った正確な位置を示します。 |
| 39 | | * ''並べて表示'' スタイルでは、左に古いリビジョン、右に新しいリビジョンを表示します(これは通常、インラインスタイルより多くのスクリーン幅を必要とするでしょう。)。追加だけ、または削除だけが行われた行は、インラインスタイルの場合と同様(それぞれ緑と赤)に着色されますが、変更された行は黄色に着色されます。 |
| | 44 | * The ''inline'' style shows the changed regions of a file underneath each other. A region removed from the file will be colored red, an added region will be colored green. If a region was modified, the old version is displayed above the new version. Line numbers on the left side indicate the exact position of the change in both the old and the new version of the file. |
| | 45 | * The ''side-by-side'' style shows the old version on the left and the new version on the right (this will typically require more screen width than the inline style.) Added and removed regions will be colored in the same way as with the inline style (green and red, respectively), but modified regions will have a yellow background. |
| 41 | | さらに、様々な高度なオプションが用意されています。右上のフォームを使用すると diff の表示を好みに調整することができます。: |
| 42 | | * 更新があった行の前後に、それぞれ何行表示するのか指定できます。 |
| 43 | | * 機能的な変更だけを手早く確認したい場合に、空行、大文字小文字の変更、空白文字の変更をそれぞれ無視することができます。 |
| | 47 | In addition, various advanced options are available in the preferences form for adjusting the display of the diffs: |
| | 48 | * You can set how many lines are displayed before and after every change |
| | 49 | (if the value ''all'' is used, then the full file will be shown) |
| | 50 | * You can toggle whether blank lines, case changes and white space changes are ignored, thereby letting you find the functional changes more quickly |
| | 51 | |
| | 52 | |
| | 53 | == The Different Ways to Get a Diff == |
| | 54 | |
| | 55 | === Examining a Changeset === |
| | 56 | |
| | 57 | When viewing a repository check-in, such as when following a |
| | 58 | changeset [wiki:TracLinks link] or a changeset event in the |
| | 59 | [wiki:TracTimeline timeline], Trac will display the exact changes |
| | 60 | made by the check-in. |
| | 61 | |
| | 62 | There will be also navigation links to the ''Previous Changeset'' |
| | 63 | to and ''Next Changeset''. |
| | 64 | |
| | 65 | === Examining Differences Between Revisions === |
| | 66 | |
| | 67 | Often you'll want to look at changes made on a file |
| | 68 | or on a directory spanning multiple revisions. The easiest way |
| | 69 | to get there is from the TracRevisionLog, where you can select |
| | 70 | the ''old'' and the ''new'' revisions of the file or directory, and |
| | 71 | then click the ''View changes'' button. |
| | 72 | |
| | 73 | === Examining Differences Between Branches === |
| | 74 | |
| | 75 | One of the core features of version control systems is the possibility |
| | 76 | to work simultaneously on different ''Lines of Developments'', commonly |
| | 77 | called “branches”. Trac enables you to examine the exact differences |
| | 78 | between such branches. |
| | 79 | |
| | 80 | Using the '''View changes ...''' button in the TracBrowser allows you to enter |
| | 81 | ''From:'' and ''To:'' path/revision pairs. The resulting set of differences consist |
| | 82 | of the changes that should be applied to the ''From:'' content in order |
| | 83 | to get to the ''To:'' content. |
| | 84 | |
| | 85 | For convenience, it is possible to invert the roles of the ''old'' and the ''new'' |
| | 86 | path/revision pairs by clicking the ''Reverse Diff'' link on the changeset page. |
| | 87 | |
| | 88 | === Checking the Last Change === |
| | 89 | |
| | 90 | The last possibility for examining changes is to use the ''Last Change'' |
| | 91 | link provided by the TracBrowser. |
| | 92 | |
| | 93 | This link will take you to the last change that was made on that path. |
| | 94 | From there, you can use the ''Previous Change'' and ''Next Change'' links |
| | 95 | to traverse the change history of the file or directory. |
