| Age | Commit message (Collapse) | Author |
|---|
|
Fix TMPDIR while here and remove the EDITOR definition, it is only used
once.
ok sthen@
|
|
"fine" jmc@
|
|
Remove the '-a' switch (auto-mode) and make this behaviour the default.
Add a new '-d' switch to get former default (full diff) mode.
General idea ok for several.
man page improvements from jmc@
ok jim@ oga@ sobrado@
ok sthen@ "sane defaults++ :)"
|
|
|
|
ok sthen@
|
|
spotted by jmc@
|
|
|
|
missed some very much needed symlinks under /etc/fonts/conf.d/).
The behaviour is the following, if a link does not exist:
* in '-a' mode, it is created automatically
* in normal mode, sysmerge will ask what you want to do
If one wants to use '-a' mode while still being in control of what
links are created, sysmerge.ignore can be used.
"sounds good to" phessler@, ok sthen@
|
|
ok sthen@
|
|
|
|
``please put it in'', pyr@
|
|
Remove top comments already duplicated in the man page.
"sure" sthen@
|
|
an entire day of mailing to make this tweak ;(
ok ajacoutot
|
|
- remove -SX from usage()
ok ajacoutot
|
|
From now on, checksums of reference files (sets and/or src) will be
stored under /var/db/sysmerge/{etcsum,xetcsum,srcsum} . This allows for
"remembering last choice" several people have requested.
This deprecates the need for -X and -S which have been removed (these
switches may come back at some point for the auto-patch feature which
halex@ proposed).
It will only compare files which reference sources have changed since
the last run and will attempt to automatically upgrade them to the
newest version provided that they have no local changes.
i.e. first run should dislay differences, second run should not display
anything except if something changed between old and new sets/src. This
way sysmerge can also warn you from files which may have been obsoleted.
General idea taken from Net/FreeBSD but we're doing things differently.
Intensively discussed with oga@, sthen@ and halex@
ok oga@ sthen@
|
|
Move unset NO_INSTALLED where it belongs, at the start of the function.
Several minor cleanups.
from Alexander Hall
ok sthen@
|
|
mostly from and ok sthen@
|
|
it impossible to install a virgin one over the currently installed one.
from Mitja Muzenic, with a tweak
|
|
that only differ by CVS Id (adapted from FreeBSD mergemaster)
Ground work on the man page, from jmc@
* do not duplicate info
* rewordings
* move some stuffs around
ok jmc@ sthen@
|
|
requested by jmc@
|
|
Tweak some outputs and put interesting messages into sysmerge.log.
export the NEED_NEWALIASES variable.
inputs from and ok sthen@
|
|
would stop comparing files.
breakage reported by and ok naddy@
|
|
|
|
worthy post run information instead of spreading info into several
files. Tweak some output while here.
Enchance description for the -S and -X options; thanks to sthen@ and
jmc@ for finding the correct wording... it was not as easy as it seems.
Fix a typo in the man page, spotted by jmc@
ok sthen@ jmc@
|
|
when a "special" file has been installed (e.g. master.passwd) but
sysmerge was interrupted: we now run the corresponding command
right after installing the file and not at the end of sysmerge run.
When DESTDIR is set and a new aliases file has been installed, try
to run newaliases from chrooted DESTDIR.
input from and ok sthen@
|
|
* constistency in redirections (and fix a wrong one)
* enclose variables
* several UPPER -> lowercase rewordings
* add "" on conditionals (suggested by jared r r spiegel a while ago)
* use cmp instead of md5 for sets comparison (from sthen@)
* some man page rewordings from sthen@
ok sthen@
|
|
corresponding to your current snapshot or release. Any file that was
modified between this old reference and the new one *and* that you did
not change locally will automatically be updated to the new version.
Make sure we don't compare files that have not changed between old and
new tarball (from Alexander Hall).
man page flushing, tweaking, rewording and enhancing from jmc@
Several people came up with this request or alike, thanks to them.
looked over and tested by several
ok weerd@
|
|
auto-mode so that the system is not left in an inconsistent state
- unify messages
- tweak manpage according to new behavior
based on an initial patch from matthieu@
ok matthieu@
|
|
ok sthen@
|
|
|
|
useful when 'sdiff eb' does not cope with one's needs.
idea and input from weerd@
ok weerd@ sthen@
|
|
ajacoutot@ ok.
|
|
and the new or old one
requested by todd@ months ago
"I like the idea" fgsch@, "should be in" todd@
|
|
mostly from andreas@
man page enhancing by jmc@
ok andreas@
|
|
- cleanup by adding usage and error_rm_wrkdir functions
feedbacks from guenther@ sthen@ and jared r r spiegel, thank you!
ok sthen
|
|
list, it's very confusing.
ok sthen@
|
|
unexpectedly
feedback and ok sthen@
|
|
files (only allow delete or merge+install); requested by nick@
no objections from laurent@ krw@ oga@
ok sthen@ nick@
|
|
noticed by and ok deraadt@
|
|
ok "bien sur!" sthen@
|
|
ok sthen@
|
|
paths using ftp(1). Thanks ajacoutot and jmc for suggestions.
ok ajacoutot jmc, no objection deraadt
|
|
|
|
- allow comments in sysmerge.ignore
suggested by, feedback from and ok naddy@
|
|
through an optionnal /etc/sysmerge.ignore file
requested by many
man page tweak from jmc@
/etc/changelist addition suggested by sthen@
ok sthen@ jdixon@ jmc@ naddy@
|
|
ttys since they are created using helper scripts and comparing CVS Id
would not be accurate
original diff from sthen@
man page tweak from jmc@
ok sthen@ jdixon@ jmc@ naddy@
|
|
Based on a diff by ajacoutot@, ok jdixon@ and sthen@ on a previous diff,
ok ajacoutot@.
|
|
sysmerge with unrelated sets
ok sthen@ pyr@ jdixon@
|
|
binaries so that some etc files don't get forgotten in the process
discussed with kurt@
tweaks and ok jmc@
|
|
issue reported by jmc@
ok pyr@ jdixon@
|
