| 1 |
On Sun, Jan 05, 2003 at 08:27:40PM -0600, Brian Jackson wrote: |
| 2 |
> I didn't even know about etc-update until I saw you mention it in your |
| 3 |
> email. So, being the good sysadmin I am, I wrote a script that has similar |
| 4 |
> functionality. I have actually been getting it ready to release for the |
| 5 |
> past week or 2. I put it up at http://www.mdrx.com/brian/ It finds all the |
| 6 |
> rogue ._cfg* files and diff's them against the real cfg file and displays |
| 7 |
> the diff's. Let me know if you find any problems with it. Also let me know |
| 8 |
> if you would like to see any other features. |
| 9 |
|
| 10 |
I personally wish etc-update were more along the lines of giving me a |
| 11 |
diff3-style merge loaded into $VISUAL for me to tweak as I see fit, and |
| 12 |
call that good enough. |
| 13 |
|
| 14 |
diff3 output is what a conflict looks like in CVS, ie |
| 15 |
|
| 16 |
<<<<< local |
| 17 |
stuff here |
| 18 |
===== |
| 19 |
new stuff here |
| 20 |
>>>>> Gentoo |
| 21 |
|
| 22 |
This is much easier to work with than sdiff unless you are really |
| 23 |
comfortable with side-by-side diffs. I never was. |
| 24 |
|
| 25 |
-- |
| 26 |
Joseph Carter <knghtbrd@×××.org> Hey, that's MY freak show! |
| 27 |
|
| 28 |
The deafening silence taught me not to ask a bunch of geeks for advice |
| 29 |
from their girlfriends |
Archives