| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
| |
of files auto-installed during an upgrade from a really old system
can get quite long, and it's piped to the PAGER already, print
that first, then print any of the 4 two-line messages that might
apply.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
process of making the script more cross platform friendly.
* Add -i option to automatically install files that do not exist
on the system already.
* Add the ability to specify DESTDIR.
* Allow the user to specify scripts to run right before the
comparison starts, and when mm is done. This will
allow the user to specify customized local behavior, and
implement features such as automatically deleting files.
* Document the above changes in the man page.
* Switch to using 'ident' for the CVS Id comparison, which
should help with portability, and makes it faster.
* Reorder, and in one case fix some code by doing things in
ways that make more sense.
* Check to see if the file exists on the system before doing
the comparisons. This saves CPU cycles, and streamlines
the auto-install process.
I used bits and pieces of suggestions and patches from various
people, ultimately too numerous to name. Which is not to say
that they were not both appreciated, and helpful in achieving
the ultimate result.
|
| | |
|
| |
|
|
|
|
|
| |
* More whitespace
* Change read -p to echo -n/read to help support portability
* Genericize an informational message regarding /.cshrc and /.profile
for the same reason
|
| |
|
|
| |
the rest of the file. (Read, put it back the way I like it.)
|
| |
|
|
| |
remove myself as co-maintainer and let Doug handle all the fun.
|
| |
|
|
| |
Approved by: Doug Barton <Doug@gorean.org>
|
| |
|
|
| |
Approved by: Doug Barton <DougB@gorean.org>
|
| |
|
|
|
|
| |
Improve the question asked when the PAGER is invalid.
Submitted by: Doug Barton <DougB@gorean.org>
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
asking a question again if given an invalid input instead of assuming
what the user wants. /etc is not the place to make assumptions when
given invalid input.
Reformat some of the more convoluted code into seperate functions instead
of being inline using tabs instead of space indents.
Allow the user to view merged files they created with sdiff.
Allow the user to redisplay the diff between the installed file and
the new file again.
Time wasted waiting for review: 1 month 2 weeks
|
| |
|
|
|
| |
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.
|
| |
|
|
|
| |
Submitted by: Doug Barton <Doug@gorean.org> (maintainer)
Approved by: you-know-who.
|
| |
|
|
|
|
| |
Submitted by: brian
Reviewed by: Doug Barton <Doug@gorean.org>
Approved by: jkh
|
| |
|
|
|
|
|
| |
Delete the original mergemaster and modify Makefile to install mergemaster.sh.
Seen no problem with by: billf
No objections by: Doug Barton
|
| |
|
|
|
|
| |
the FreeBSD default motd and the system motd
Submitted by: author
|
| |
|
|
|
|
| |
version number now that we have it.
Reviewed by: author
|
| | |
|
| |
|
|
| |
Submitted by: chris
|
| | |
|
| | |
|
| | |
|
|
|
Submitted by: Doug Barton <doug@gorean.org>
|
