Bug 12912

Summary:	Improve etc-udpate merging
Product:	Portage Development	Reporter:	Philippe Fremy <pfremy>
Component:	Unclassified	Assignee:	Nicholas Jones (RETIRED) <carpaski>
Status:	RESOLVED INVALID
Severity:	normal
Priority:	High
Version:	unspecified
Hardware:	All
OS:	All
Whiteboard:
Package list:		Runtime testing required:	---

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