Eskil

Check-in [19ce785f85]
Login

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

Overview
Comment:*** empty log message ***
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 19ce785f8546a41c6cdaeb7c7bd8d56a57d99d2c
User & Date: peter 2004-07-03 15:53:07.000
Context
2004-07-03
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
15:53
*** empty log message *** check-in: 19ce785f85 user: peter tags: trunk
15:34
In ClearCase revisions, a missing rev number now means latest. Init vars correctly in conflict mode check-in: 0e57fae9f8 user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Added doc/revision.txt. 














































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

Eskil can compare versions in revision control systems.
Currently RCS, CVS and ClearCase are supported.

If you specify only one file on the command line to Eskil, it will
automatically detect if the file is under revision control and enter
revision control mode.

By default the local file is compared against the latest checked in version,
which is the simple case when you just want to know what you have changed
before checking in.

You can use the -r option to select which version to compare.  It works
like it does in "cvs diff". Examples:

eskil file.txt
  Compare file.txt with the latest checked in version.
eskil -r rev file.txt
  Compare file.txt with the specified version.
eskil -r rev1 -r rev2 file.txt
  Compare the two revisions. This does not involve the local copy of file.txt.


For RCS and CVS version numbers to -r are rather straightforward since they
work just like for -r to them.

For ClearCase there are more possibilites.
ClearCase stream names are build like file paths and in -r you can access the
streams similar to how you find files.
Your current stream is the "current directory".
-r 5                    : Version 5 in current stream.
-r .                    : Latest version in current stream.
-r /full/path/stream/4  : The identified version.
-r /full/path/stream    : Latest version in that stream.
-r ../5                 : Version in parent stream.
-r ..                   : Latest in parent stream.
-r stream/5             : Version in stream, anywhere in tree.
-r stream               : Latest in stream, anywhere in tree.