Graphical etc-update

puddpunk · l33t Joined: 20 Jul 2002 Posts: 681 Location: New Zealand

I have to say, I don't really understand the concept of DIFF_COMMAND and MERGE_COMMAND. I can put kompare in the DIFF_COMMAND ok, but then what? What do I have to do to make it write the changes, write some of the changes or discard the whole file?

Can somebody please explain?

zojas · Posted: Tue Feb 11, 2003 4:28 am Post subject:

the original idea was that the diff_command would just run diff and show you the changes. then the merge_command would be some sort of interactive program to merge the changes together.

I just use gvim -d as the diff command then I can see the diff and perform the merge at the same time in my favorite text editing environment. then I never invoke the merge command from the etc-update command. I just write whatever tweaks I want to one of the files and then use options 1 and 2 from the etc-update menu.

puddpunk · l33t Joined: 20 Jul 2002 Posts: 681 Location: New Zealand

Ah! Brilliant!

Thanks alot zojas

metal · n00b Joined: 01 Oct 2002 Posts: 36 Location: Spain

KDE users might want to use kdiff3, which have a -m (merge) and a -o (output file) command line option, but I haven't tried it yet.

idiotprogrammer · Apprentice Joined: 29 Jul 2002 Posts: 179 Location: Texas

Well, the idea of using a diff gui sounds awfully appealing.

But ...

even after trying the etc-update changes to tell it to use gtkdiff, it causes a seg fault. (I am just using X, not a fancy window manager though).

Also, I noticed that gtkdiff doesn't allow you to see files starting with a period, which by the way, is how almost all of the config files are.

So unless there's a command line that allows gtkdiff to make . files visible, then the gui is mostly useless.

rj

Bemke · n00b Joined: 18 Feb 2003 Posts: 2

I dont like etc-updates UI, it takes to much time... I use a simple script instead

$ cat etc-diff

if [ "$1" == "" ]
then
echo etc-diff file1 [file2]
exit
fi

f1=$1
f2=$2
if [ "$2" == "" ]

then
f1=$1
f2=`echo $f1 | awk '{print gensub("._cfg0000_", "", "g", $1)}'`
fi

diff -b -B "$f1" "$f2" |grep '[<>]'|grep -v '< #'|grep -v '> #'
echo "Overwrite $f2 with $f1?";read i
if [ "$i" = "y" ]
then
mv "$f1" "$f2"
echo $f2 is overwritten with $f1
else
echo "Delete $f1?";read i
if [ "$i" = "y" ]
then
rm -f "$f1"
echo "$f1 deleted!"
fi
fi

fbreuer · Posted: Mon Jun 23, 2003 5:14 pm Post subject:

Another nice program for graphical diff'ing (for use with Gnome 2 for example) is meld. See http://meld.sourceforge.net and try

Belgabor · n00b Joined: 03 Jul 2003 Posts: 63 Location: Germany

meld looks sweet but unfortunately its useless for merges or diffs that include a lot of whitespace change (it lacks the option to ignore whitespace).

I currently use xxdiff for etc-update using the following lines:
diff_command="xxdiff --style keramik %file1 %file2"
merge_command="xxdiff -m --resource 'Show.PaneMergedView:true' --style keramik -O -M %merged %orig %new"

Jimbow · Posted: Sat Aug 09, 2003 8:08 pm Post subject:

I've been using xxdiff too. Works great.
_________________
After Perl everything else is just assembly language.

rjtupas · Posted: Sat Aug 16, 2003 6:27 am Post subject: What about "using_editor=0"

I've made the changes discussed in the first post. Do I need to edit the "using_editor=0" line in /etc/etc-config if I am using gtkdiff?
TIA,

Randy

meowsqueak · Posted: Thu Oct 16, 2003 1:53 am Post subject:

Tkdiffb, which is part of the tkcvs package, makes a nice graphical merge tool, and it integrates well with etc-update.

Although I have to say, I like the way meld works - a bit confusing at first, but the linked scrolling is pure magic!

Lasitus · Posted: Mon Feb 07, 2005 10:56 pm Post subject:

Great idea! I have been wanting this but didn't looked into it personally. I got it to open etc-update as my user, but I don't have rights to write the file. (BTW, I am using kompare)

Lasitus · Posted: Wed Feb 09, 2005 5:16 pm Post subject:

Hmm, didn't notice this post was from 2003... Well I got it display kompare by not using sudo. I got a whole mess of errors though it seemed to work.

xentric · Guru Joined: 16 Mar 2003 Posts: 410 Location: Netherlands

The user who started X should run "xhost +localhost" and that user should
also belong to the wheel group, otherwise he/she cannot su to root.

You could also try sux (emerge sux) instead of su! I've heard from lot's of
people that sux just works when su fails under X.
_________________
When all else fails, read the manual...
Registered Linux User #340626

xentric · Guru Joined: 16 Mar 2003 Posts: 410 Location: Netherlands

double...
_________________
When all else fails, read the manual...
Registered Linux User #340626

Lasitus · Posted: Fri Feb 11, 2005 1:58 am Post subject:

Yeah, I wasn't in the wheel group. I was using:

j-m · Retired Dev Joined: 31 Oct 2004 Posts: 975

Why don´t you use dispatch-conf? If you emerge app-text/rcs you will have a complete history of your config files at your hand... :?:

FreeManAtomic · Guru Joined: 01 Feb 2005 Posts: 365

Hi,
I done the changes, but don't work.
When start the etc-update command i always see a text-version :roll:

Sorry for my english

Tinitus · Veteran Joined: 20 Sep 2004 Posts: 1754

Hello,

I tried the things from the 1st Posting ...

but I always get :

eg. /usr/sbin/etc-update: line 242: "gtkdiff: command not found

Why

R R

its1louder · Posted: Mon May 16, 2005 7:25 pm Post subject:

badgers · l33t Joined: 04 Sep 2003 Posts: 680 Location: Madison, WI

xentric · Guru Joined: 16 Mar 2003 Posts: 410 Location: Netherlands

badgers · l33t Joined: 04 Sep 2003 Posts: 680 Location: Madison, WI

thank you
_________________
Abit KD7-S
Athlon XP2500+
166mHz FSB
512 Meg PC3200 Ram running at 166mHz
LiteOn DVD dual Layer burner(hdc)

2.6.17 Suspend2 kernel with no scsi support