45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
\u2022\tSelect menu File->Open Ancestor File.
\u2022\tSelect file mergeanc.txt
</bullet>
The merge window will appear with most changes merged. Conflicts are marked with gray, and a row of asterisks in the status bar. Conflicts are resolved to the right initially. Navigate between conflicts using ctrl-up/down keys. Select side with left/right keys. Hover over the status bar to see ancestor info.
<b>Regular expression preprocessing</b>
Double click on enum.c to bring up the diff.
[write something here to explain the problem and the goal]
\u2022\tPress "Add" to add a new preprocessing set.
\u2022\tEnter the regular expression "^.*?\\m(Apa\\w+).*$" in the field.
\u2022\tEnter "\\1" in the substitution field.
\u2022\tEnter a word starting with "Apa" in one of the example fields and see that the result is just that word.
\u2022\tPress "Ok" and select menu File->Redo Diff.
</bullet>
A shortcut for the above is to use "-prefix Apa" on the command line.
<b>Changed filename in directory diff</b>
<bullet>
\u2022\tRight click on "namechange1" in Directory Diff's left window.
\u2022\tSelect "Mark File" in the menu.
\u2022\tRight click on "namechange2" in Directory Diff's right window.
\u2022\tSelect "Compare with..." in the menu.
|
|
<
>
>
|
>
|
|
|
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
\u2022\tSelect menu File->Open Ancestor File.
\u2022\tSelect file mergeanc.txt
</bullet>
The merge window will appear with most changes merged. Conflicts are marked with gray, and a row of asterisks in the status bar. Conflicts are resolved to the right initially. Navigate between conflicts using ctrl-up/down keys. Select side with left/right keys. Hover over the status bar to see ancestor info.
<b>Regular expression preprocessing</b>
Sometimes there are things in files being compared that you want to highlight or disregard. This preprocessing step applies search/replace regular expressions on the files being compared before lines are matched. The result is only used for determining equality. The original is always used for display and if lines differ after preprocessing, all changes are shown for that line.
[add reference to re_syntax and regsub manuals]
Double click on enum.c to bring up the diff.
<bullet>
\u2022\tSelect menu Options->Preprocess.
\u2022\tIf there is no clear set, press "Add" to add a new preprocessing set.
\u2022\tPress "Edit" to edit that preprocessing set.
\u2022\tEnter the regular expression "^.*?\\m(Apa\\w+).*$" in the Regexp field.
\u2022\tEnter "\\1" in the substitution field.
\u2022\tEnter a word starting with "Apa" in one of the example fields and see that the result is just that word.
\u2022\tPress "Ok" and select menu File->Redo Diff.
</bullet>
A shortcut for the above is to use "-prefix Apa" on the command line, or to use the "Add Prefix" button and enter "Apa" as prefix.
<b>Changed filename in directory diff</b>
<bullet>
\u2022\tRight click on "namechange1" in Directory Diff's left window.
\u2022\tSelect "Mark File" in the menu.
\u2022\tRight click on "namechange2" in Directory Diff's right window.
\u2022\tSelect "Compare with..." in the menu.
|