Bug #1185

need a tool to merge changes into /etc

Added by wa1ter almost 6 years ago. Updated 8 months ago.

Status:NewStart date:
Priority:HighDue date:
Assignee:-% Done:

0%

Category:-
Target version:-

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.

History

#1 Updated by dillon almost 6 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
<>

#2 Updated by pavalos over 5 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.

#3 Updated by robgar 8 months ago

  • Description updated (diff)
  • Status changed from New to Closed
  • Assignee deleted (0)

#4 Updated by swildner 8 months ago

  • Status changed from Closed to New

Also available in: Atom PDF