Michael Bevilacqua on Sun, 02 Feb 2003 23:30:33 -0500


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

[PLUG] Suggestions on merging diffs...


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. 



-- 
Regards,

Michael Bevilacqua

   ~
  . .
  /V\   Michael@Bevilacqua.us
 // \\
/(   )\
 ^`~'^

_________________________________________________________________________
Philadelphia Linux Users Group        --       http://www.phillylinux.org
Announcements - http://lists.netisland.net/mailman/listinfo/plug-announce
General Discussion  --   http://lists.netisland.net/mailman/listinfo/plug