[DragonFlyBSD - Bug #1185] need a tool to merge changes into /etc

[liweitianux]

Issue #1185 has been updated by liweitianux.


I have the idea of developing a @rcs(1)@-based @mergemaster@ tool that can automatically merge the updates to @/etc@ files. @git@ would be a much better choice, but it's difficult to integrate it into base (both complex dependencies and license).

It should track user's version and the system's version of @/etc@ files in separate branches, and then do an auto merge during upgrade. It should also support 3-way compare/merge and postpone/resume a merge.

----------------------------------------
Bug #1185: need a tool to merge changes into /etc
http://bugs.dragonflybsd.org/issues/1185#change-14877

* Author: wa1ter
* Status: New
* Priority: High
----------------------------------------
I run mergemaster occasionally because it catches files that
make upgrade misses.  Today it misses about half a dozen or
so, including aliases, ftpusers, /usr/Makefile, and maybe a
few others I can't remember.

Thanks.



-- 
You have received this notification because you have either subscribed to it, or are involved in it.
To change your notification preferences, please click here: http://bugs.dragonflybsd.org/my/account