Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 21005 - Using diffutils in etc-update
Summary: Using diffutils in etc-update
Status: RESOLVED FIXED
Alias: None
Product: Portage Development
Classification: Unclassified
Component: Core (show other bugs)
Hardware: All Linux
: High enhancement
Assignee: Portage team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-05-14 08:30 UTC by Jörg Hoh
Modified: 2011-10-30 22:37 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jörg Hoh 2003-05-14 08:30:07 UTC
It's anyoing for me to merge the changes in configuration files interactivly
with that crude merging system etc-update provides. It is very hard to overview
all changes. I'd like to do this in an editor of my choice, and resolve
conflicts like in cvs.

Reproducible: Always
Steps to Reproduce:
1.
2.
3.
Comment 1 Chris Gianelloni (RETIRED) gentoo-dev 2003-05-14 15:18:12 UTC
Edit your /etc/etc-update.conf file and make changes there.
Comment 2 Jörg Hoh 2003-05-20 14:59:59 UTC
Can you give me more details? diff_command="vim -d %file1 %file2" is not that, what I want. I want something like that:

1) Make a diff between the old and the new version
2) Apply that diff on my old config-file (using patch or something like that)
3) If there are conflicts, open an editor and let me fix it
Comment 3 Chris Gianelloni (RETIRED) gentoo-dev 2003-05-20 18:17:08 UTC
diff_command="mydiffscript.sh %file1 %file2"
merge_command="mymergescript %merged %orig %new"

You could always make your own shell scripts to have it act however you want.  That is the beauty of the way this is implemented in Gentoo.  It simply reads a variable that tells it what to do.  Personally, I use a shell script that checks to see if I am in X or not.  If I am in X, it runs gtkdiff, otherwise it uses diff and sdiff.  The system is only as inflexible as you make it.  The current system is in place as it is because it is simple and it works on every Gentoo system.
Comment 4 Chris Gianelloni (RETIRED) gentoo-dev 2003-07-13 13:48:56 UTC
Removing myself from this bug... appears to be going nowhere...
Comment 5 Alec Warner (RETIRED) archtester gentoo-dev Security 2005-04-19 20:04:05 UTC
Bump, INVALID? User can't write shell scripts?  Dup of a dozen other bugs regardling the crappiness of etc-update and friends indicative that we need better etc-update tools.  ( no offense to poster meant btw, by the above ).
Comment 6 Jason Stubbs (RETIRED) gentoo-dev 2005-05-24 19:11:23 UTC
dispatch-conf