Re: Modified TODO (and RELEASE) in both trees.

[Rob Browning]

Thien-Thi Nguyen <address@hidden> writes:

> i think the Id tag is useful.  have you considered using "-kk"?
> (see cvs manual, node: "Merging and keywords" for more info.)

Well, I must admit I don't really see what use the version number is
here.  If you want to see the recent changes, you can run a cvs diff
-u -D yesterday -D now (or similar), and if you really want to know
the version number you can run cvs status.

The disadvantage to using keywords (with branches) is that it will
cause spurious conflicts when you're merging unlesss (as you mention),
you use -kk, and then you run the risk of corrupting binary files,
(which we might have if we ever end up byte-compiling or similar).
Further, people will actually have to remember when they're supposed
to use -kk.  (Note: see "Branches and Keyword Expansion - Natural
Enemies" in the info pages for what originally made me think about
this...)

I guess to me it just seems like a potential problem with little
benefit.

-- 
Rob Browning
rlb @defaultvalue.org, @linuxdevel.com, and @debian.org
Previously @cs.utexas.edu
GPG=1C58 8B2C FB5E 3F64 EA5C  64AE 78FE E5FE F0CB A0AD