On Thu, 1 Feb 2007, Roland Smith wrote:
On Thu, Feb 01, 2007 at 04:02:33PM -0500, Dak Ghatikachalam wrote:
This worked great but on mergemaster -cv in single user , at one point it
asked me these questions , I got nervous and puzzled
Use 'd' to delete the temporary ."xxxxxxxxxxxxxxxxx"
Use 'i' to install the temporary ."xxxxxxxxxxxxxxxxx"
Use 'm' to merge the temporary and installed versions
Use 'v' to view the diff results again
# xxx refers to path for config files, I running on default freebsd mode
and did not made any change
Config files can be enhanced/updated in between versions.
I just presses ENTER key the default ( because it advised to be left for
DO I just not bother any more.
If it is a file where you are certain you haven't made changes, choose
'i'. (E. g. the scripts in /etc/rc.d)
For some files it is better to keep your version, like /etc/rc.conf, or
/etc/hosts. So it's probably best to choose 'd', or save for later.
In other files, like /etc/group, you want to keep your modifications,
but you probably also want to keep the changes that the new version
makes. Sometimes the new groups are essential for the running of the
systems. In this case you can either use merge, or save it for later.
What I tend to do is to keep copies of all the config files that I have
changed in a subdirectory ~/settings. If I want to make changes
to one of those files, I make the changes in the file in ~/settings, and
then copy them to /etc. The files in ~/settings are kept under revision
control (e.g. RCS), so that I retain previous versions. This enables me
to repair things if I screw something up.
[plain text _non-HTML_ PGP/GnuPG encrypted/signed email much appreciated]
pgp: 1A2B 477F 9970 BA3C 2914 B7CE 1277 EFB0 C321 A725 (KeyID: C321A725)
Did fry me a bit though when I moved one of my machines from 6.2-release to
7. mergemaster toasted my /etc/group file -_-...
Isn't there a file or directive (like .keep) that tells mergemaster not to
check or replace a file?
email@example.com mailing list
To unsubscribe, send any mail to "[EMAIL PROTECTED]"