public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Joseph Carter <knghtbrd@efn.org>
To: Brian Jackson <brian-lists@mdrx.com>
Cc: gentoo-dev@gentoo.org
Subject: Re: [gentoo-dev] Re: etc-update & ._cfg* files: major issue with gentoo?
Date: Sun, 5 Jan 2003 22:40:39 -0800	[thread overview]
Message-ID: <20030106064039.GB8321@bluecherry.net> (raw)
In-Reply-To: <20030106022740.4276.qmail@escalade.vistahp.com>

[-- Attachment #1: Type: text/plain, Size: 1185 bytes --]

On Sun, Jan 05, 2003 at 08:27:40PM -0600, Brian Jackson wrote:
> I didn't even know about etc-update until I saw you mention it in your 
> email. So, being the good sysadmin I am, I wrote a script that has similar 
> functionality. I have actually been getting it ready to release for the 
> past week or 2. I put it up at http://www.mdrx.com/brian/ It finds all the 
> rogue ._cfg* files and diff's them against the real cfg file and displays 
> the diff's. Let me know if you find any problems with it. Also let me know 
> if you would like to see any other features. 

I personally wish etc-update were more along the lines of giving me a
diff3-style merge loaded into $VISUAL for me to tweak as I see fit, and
call that good enough.

diff3 output is what a conflict looks like in CVS, ie

  <<<<< local
  stuff here
  =====
  new stuff here
  >>>>> Gentoo

This is much easier to work with than sdiff unless you are really
comfortable with side-by-side diffs.  I never was.

-- 
Joseph Carter <knghtbrd@efn.org>                Hey, that's MY freak show!
 
The deafening silence taught me not to ask a bunch of geeks for advice
from their girlfriends


[-- Attachment #2: Type: application/pgp-signature, Size: 273 bytes --]

  parent reply	other threads:[~2003-01-06  6:41 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-01-06  1:41 [gentoo-dev] etc-update & ._cfg* files: major issue with gentoo? Dhruba Bandopadhyay
2003-01-06  2:27 ` [gentoo-dev] " Brian Jackson
2003-01-06  5:24   ` Viktor Lakics
2003-01-06  6:03     ` Brian Jackson
2003-01-06 10:49     ` Jeremy Wohl
2003-01-06  6:40   ` Joseph Carter [this message]
2003-01-06  7:25 ` Kai Großjohann
2003-01-06 10:26   ` Toby Dickenson
2003-01-06 13:15     ` Thomas T. Veldhouse
2003-01-06 13:02   ` Bengt Gorden
2003-01-10 11:10     ` Kai Großjohann
2003-01-10 15:25       ` Brian Hall
2003-01-10 15:33         ` Oliver Rutherfurd
2003-01-06 15:20   ` Joseph Carter
2003-01-06  7:37 ` [gentoo-dev] " Sven Vermeulen
     [not found] ` <200301060054.29991.absinthe@pobox.com>
2003-01-10 22:38   ` [gentoo-dev] " Kai Großjohann
2003-01-10 23:05     ` William Kenworthy
2003-01-11  1:48       ` Joseph Carter
2003-01-11 10:14       ` Kai Großjohann
2003-01-11 15:19         ` [gentoo-dev] Diff alternatives for etc-update (WAS: etc-update & ._cfg* files: major issue with gentoo?) Dylan Carlson
     [not found]           ` <84hecfmmpb.fsf@lucy.cs.uni-dortmund.de>
2003-01-11 21:29             ` [gentoo-dev] Re: Diff alternatives for etc-update Dylan Carlson
2003-01-11 21:44               ` Paul de Vrieze
2003-01-11 23:59                 ` Dylan Carlson
2003-01-13 22:39           ` [gentoo-dev] Diff alternatives for etc-update (WAS: etc-update & ._cfg* files: major issue with gentoo?) Peter Ruskin
2003-01-13 22:50             ` Dylan Carlson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20030106064039.GB8321@bluecherry.net \
    --to=knghtbrd@efn.org \
    --cc=brian-lists@mdrx.com \
    --cc=gentoo-dev@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox