Current-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cvslatest vs. local changes



Any clue on how to make ``build.sh -P'' work when you have local
changes in the source tree, and those changes have been merged
with subsequent real changes via ``cvs update''?

I'm getting

	nbcvslatest: Malformed time `Result of merge' in `/build/netbsd-local/src_ro/distrib/sets/lists/debug/CVS/Entries'

There are indeed several changed files in my local tree which have
the `Result of merge' value in the date field.

The cvslatest(1) utility has a ``-i'' switch to ignore malformed
time-stamps, but there doesn't seem to be any way for build.sh to
specify it.

Since the `Result of merge' seems to be a valid value, perhaps we
should either just ignore it, or stat(1) the relevant source file
and use its last-modified date?

+--------------------+--------------------------+-----------------------+
| Paul Goyette       | PGP Key fingerprint:     | E-mail addresses:     |
| (Retired)          | FA29 0E3B 35AF E8AE 6651 | paul%whooppee.com@localhost     |
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoyette%netbsd.org@localhost   |
+--------------------+--------------------------+-----------------------+


Home | Main Index | Thread Index | Old Index