Project

General

Profile

Actions
Copy link

Bug #1185

open

need a tool to merge changes into /etc

Added by wa1ter over 13 years ago. Updated over 8 years ago.

Status:
New
Priority:
High
Assignee:
-
Category:
-
Target version:
-
Start date:
Due date:
% Done:

0%

Estimated time:

Description

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.

Actions
Copy link
 #1

Updated by dillon over 13 years ago

: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.

Well, we could add /usr/Makefile easily enough, that file is not 
    modified by the sysad.  ftpusers and aliases can be edited by the
    sysad so make upgrade can't just copy a new one in.
I very explicitly do NOT want make upgrade to try to mess with
    files that are typically modified by the sysadmin.  However, there
    is no reason why it couldn't compare them and generate a warning at
    the end for files needing manual work.  It could even suggest running
    mergemaster :-)
Would someone like to add /usr/Makefile and a basic compare/warning
    feature for the other files to make upgrade?
-Matt
                    Matthew Dillon 
                    <>
Actions
Copy link
 #2

Updated by pavalos over 13 years ago

What about putting /etc under git control? make upgrade can do a merge and then
if there's a conflict, git would complain.

Actions
Copy link
 #3

Updated by robgar over 8 years ago

  • Description updated (diff)
  • Status changed from New to Closed
  • Assignee deleted (0)
Actions
Copy link
 #4

Updated by swildner over 8 years ago

  • Status changed from Closed to New
Actions
Copy link

Also available in: Atom PDF