https://bugs.dragonflybsd.org/https://bugs.dragonflybsd.org/favicon.ico?16293952082008-12-20T14:05:02ZDragonFlyBSD bugtrackerDragonFlyBSD - Bug #1185: need a tool to merge changes into /etchttps://bugs.dragonflybsd.org/issues/1185?journal_id=56712008-12-20T14:05:02Zdillon
<ul></ul><p>:I run mergemaster occasionally because it catches files that<br />:make upgrade misses. Today it misses about half a dozen or<br />:so, including aliases, ftpusers, /usr/Makefile, and maybe a<br />:few others I can't remember.<br />:<br />:Thanks.</p>
<pre><code>Well, we could add /usr/Makefile easily enough, that file is not <br /> modified by the sysad. ftpusers and aliases can be edited by the<br /> sysad so make upgrade can't just copy a new one in.</code></pre>
<pre><code>I very explicitly do <strong>NOT</strong> want make upgrade to try to mess with<br /> files that are typically modified by the sysadmin. However, there<br /> is no reason why it couldn't compare them and generate a warning at<br /> the end for files needing manual work. It could even suggest running<br /> mergemaster :-)</code></pre>
<pre><code>Would someone like to add /usr/Makefile and a basic compare/warning<br /> feature for the other files to make upgrade?</code></pre>
<pre><code>-Matt<br /> Matthew Dillon <br /> &lt;<a class="email" href="mailto:dillon@backplane.com">dillon@backplane.com</a>&gt;</code></pre> DragonFlyBSD - Bug #1185: need a tool to merge changes into /etchttps://bugs.dragonflybsd.org/issues/1185?journal_id=59652009-01-26T06:28:09Zpavalos
<ul></ul><p>What about putting /etc under git control? make upgrade can do a merge and then<br />if there's a conflict, git would complain.</p> DragonFlyBSD - Bug #1185: need a tool to merge changes into /etchttps://bugs.dragonflybsd.org/issues/1185?journal_id=117512014-02-18T13:47:22Zrobgar
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/11751/diff?detail_id=1318">diff</a>)</li><li><strong>Status</strong> changed from <i>New</i> to <i>Closed</i></li><li><strong>Assignee</strong> deleted (<del><i>0</i></del>)</li></ul> DragonFlyBSD - Bug #1185: need a tool to merge changes into /etchttps://bugs.dragonflybsd.org/issues/1185?journal_id=117552014-02-18T14:02:08Zswildner
<ul><li><strong>Status</strong> changed from <i>Closed</i> to <i>New</i></li></ul>