Eskil

Check-in [d045126745]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Updated Revision Diff and Rev fields.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: d0451267450f7d302d079132ecd2d0f79176238c
User & Date: peter 2004-07-03 16:42:43.000
Context
2004-08-16
20:01
Added Edit Mode. check-in: c16931707a user: peter tags: trunk
2004-07-03
16:42
Updated Revision Diff and Rev fields. check-in: d045126745 user: peter tags: trunk
16:38
Centralized some revsion control and conflict code. Added "Revision diff" menu instead of CVS/RCS Diff menus. check-in: 816965deae user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to doc/eskil.txt. 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20


<ul>Commands</ul>

File Menu
  Redo Diff         : Run diff again on the same files.
  Open Both         : Select two files, run diff.
  Open Left File    : Select a file for left window, run diff
  Open Right File   : Select a file for right window, run diff
  Open Conflict File: Select a file containing conflicts such as from
                      a CVS merge.
  Open Patch File   : Display a patch file created by diff -c or diff -u.
  RCSDiff           : Select one file and diff like rcsdiff.
  CVSDiff           : Select one file and diff like cvs diff.
  Print             : Experimental print function.
                      It currently creates a postscript file ~/eskil.ps
  Close             : Close this window.
  Quit              : Guess

Options Menu
  Font     : Select font and fontsize for the two main text windows












|
<








1
2
3
4
5
6
7
8
9
10
11
12

13
14
15
16
17
18
19


<ul>Commands</ul>

File Menu
  Redo Diff         : Run diff again on the same files.
  Open Both         : Select two files, run diff.
  Open Left File    : Select a file for left window, run diff
  Open Right File   : Select a file for right window, run diff
  Open Conflict File: Select a file containing conflicts such as from
                      a CVS merge.
  Open Patch File   : Display a patch file created by diff -c or diff -u.
  Revision Diff     : Select one revision controlled file.

  Print             : Experimental print function.
                      It currently creates a postscript file ~/eskil.ps
  Close             : Close this window.
  Quit              : Guess

Options Menu
  Font     : Select font and fontsize for the two main text windows
︙︙
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64

  Directory Diff    : Window for comparing directories
  Clip Diff         : Gives two areas where you can paste text and diff them.
  Merge             : Perform a two way merge.
  Clear Align       : Clear alignment info for this diff.  The effect does not
                      show until you do "Redo Diff".

Diff Options Field: Any text written here will be passed to diff.
Rev 1/2 Fields    : In RCS/CVS mode, these field are passed as -r options to
                    diff, to select versions.

Prev Diff Button: Scrolls to the previous differing block, or to the top
                  if there are no more diffs.
Next Diff Button: Scrolls to the next differing block, or to the bottom
                  if there are no more diffs.

Equal sign: Above the vertical scrollbar, a "=" will appear if the files








|
|








48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63

  Directory Diff    : Window for comparing directories
  Clip Diff         : Gives two areas where you can paste text and diff them.
  Merge             : Perform a two way merge.
  Clear Align       : Clear alignment info for this diff.  The effect does not
                      show until you do "Redo Diff".

Diff Options Field: Any text written here will be passed to diff.
Rev 1/2 Fields    : In Revision mode, these field are selects versions to be
                    compared.

Prev Diff Button: Scrolls to the previous differing block, or to the top
                  if there are no more diffs.
Next Diff Button: Scrolls to the next differing block, or to the bottom
                  if there are no more diffs.

Equal sign: Above the vertical scrollbar, a "=" will appear if the files
︙︙