Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 12912 - Improve etc-udpate merging
Summary: Improve etc-udpate merging
Status: RESOLVED INVALID
Alias: None
Product: Portage Development
Classification: Unclassified
Component: Unclassified (show other bugs)
Hardware: All All
: High normal (vote)
Assignee: Nicholas Jones (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-12-29 13:57 UTC by Philippe Fremy
Modified: 2011-10-30 22:20 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 Philippe Fremy 2002-12-29 13:57:54 UTC
Because etc-update wants a merge client to distinguish between source1,  
source2 and merge destination, most of the existing merge clients are not  
suitable to use with etc-update.  
  
Kompare and vim for example can not be used. As far as I know, sdiff is the  
only merge client that works with etc-update and I find his interface really  
poor.  
  
I'll patch kompare so that it can work with etc-update but I think it would be  
wise to consider making etc-update more versatile.  
  
As a first step, it should be possible using last modification time checks and 
stuff like that to know if a file has been merged by the merge client without 
relying on a third merged file.
Comment 1 Nicholas Jones (RETIRED) gentoo-dev 2003-02-03 06:24:35 UTC
not helpful. try dispatch-conf