Walt Mankowski on Mon, 03 Feb 2003 05:50:29 -0500


[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]

Re: [PLUG] Suggestions on merging diffs...


On Sun, Feb 02, 2003 at 11:24:59PM -0500, Michael Bevilacqua wrote:
> 
> This may be a moot point to the majority of the Gentoo user base but
> I've found a way to quickly knock out the manual merging of config's 
> after an `emerge -u --deep world` .
> 
> First I read them into vimdiff(1) with the current working versions:
> 
> for i in `find /etc -iname '._cfg????_*'`; do vimdiff `echo $i | sed s/._cfg0000_//` $i ; done
> 
> Then I erase the ._cfg0000's I just reviewed/merged:
> 
> for i in `find /etc -iname '._cfg????_*'`; do rm $i; done
> 
> I'm interested in hearing if anyone else on the list has a more
> efficient way of handling this process. 

Ugh, that sounds ugly.  I don't suppose there's any way to use
patch(1) to merge the differences?

Walt

Attachment: pgplFW8UNoMhS.pgp
Description: PGP signature