Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 61577 - Make etc-update (or dispatch-conf) show the differences between the new file and the old original file
Summary: Make etc-update (or dispatch-conf) show the differences between the new file ...
Status: RESOLVED INVALID
Alias: None
Product: Portage Development
Classification: Unclassified
Component: Core (show other bugs)
Hardware: x86 Linux
: High enhancement (vote)
Assignee: Portage team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-08-24 17:29 UTC by Adam
Modified: 2004-09-21 19:11 UTC (History)
0 users

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 Adam 2004-08-24 17:29:02 UTC
What I would like to see etc-update or its improvement dispatch-conf do is this:

When there is a file to be updated, and it has been modified by the user, also download the original of the version that the user modified, and show the differences between that original and the new update, rather than the differences between the user's version and the new update.

This may be difficult to do but the benefits would be large.  I would be able to quickly see what has changed in the newer configuration file so I'd know quicker whether to update it.  Currently, I have to look through the differences and try to figure out which changes were made by me and which are updates.

Better yet, when merging, it could make only the changes that were made in the portage tree, keeping user changes intact, without needing user interaction.


Reproducible: Always
Steps to Reproduce:
1.
2.
3.
Comment 1 Nicholas Jones (RETIRED) gentoo-dev 2004-09-21 18:26:41 UTC
dispatch-conf can do 3-way diffs. There are also patches in bugs.
Comment 2 Adam 2004-09-21 19:11:03 UTC
I don't understand.  How does 3-way differences allow this feature?  Wouldn't we still need the original configuration file that the user's file is based on?

What does "There are also patches in bugs" mean?