Code: Select all
# kdiff3 --version
Qt: 4.5.0
KDE: 4.2.1 (KDE 4.2.1)
kdiff3: 0.9.95
Code: Select all
# kdiff3 --display :0.0Code: Select all
# kdiff3 --version
Qt: 4.5.0
KDE: 4.2.1 (KDE 4.2.1)
kdiff3: 0.9.95
Code: Select all
# kdiff3 --display :0.0Code: Select all
kdesu cfg-update
Code: Select all
# cfg-update -uCode: Select all
(run) kdesu konsole??
(run) kdesu cfg-update??Code: Select all
# cfg-update -u -t /usr/kde/4.2/bin/kdiff3Code: Select all
In kdiff3 you select the lines that you want to keep.
When done, click the save button and exit kdiff3!
When you exit kdiff3, cfg-update will finish the update...
* GUI not available, unable to run the mergetool set in /etc/cfg-update.conf!
Run cfg-update from within an X-terminal if you want to use a GUI mergetool.
If you are getting this from within an X-terminal, you should try running
"xhost +localhost" as the user who started the X-server.
If you use this script on a system without an X-server you should permanently
set the MERGETOOL variable in /etc/cfg-update.conf to vimdiff or sdiff.
I recommend the more advanced vimdiff on systems without an X-server.
See http://people.zeelandnet.nl/xentric for vimdiff usage instructions.
try thispetlab wrote:No, I didn't. How would you do that?
Code: Select all
$ kdesu -t "cfg-update -u"
Searching for updates...
<< Stage1 >> 0 files in queue for automatic replacing, skipping...
<< Stage2 >> 3 files in queue for automatic 3-way merging, starting...
(1/5) /etc/genkernel.conf *Modified File
* Merge conflict(s) found, this file will be re-scheduled for manual updating.
Update canceled...
(2/5) /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx *Modified File
* Merge conflict(s) found, this file will be re-scheduled for manual updating.
Update canceled...
(3/5) /etc/mono/2.0/machine.config *Modified File
* Merge conflict(s) found, this file will be re-scheduled for manual updating.
Update canceled...
<< Stage3 >> 3 files in queue for manual 3-way merging, starting...
(1/5) /etc/genkernel.conf *Modified File
* YOU ARE ABOUT TO UPDATE A MODIFIED FILE WHICH PROBABLY CONTAINS
* CUSTOM SETTINGS. YOU ARE FORCED TO UPDATE MANUALLY!
Press [y] - to merge the current file and the ._cfg0000_* file with kdiff3
Press [s] - to skip this update (to investigate first, and try again later)
Press [q] - to quit cfg-update immediately
Merge manually with file : /etc/._cfg0000_genkernel.conf ? [y|s|q]
Code: Select all
$ sudo cfg-update -u
Searching for updates...
<< Stage1 >> 0 files in queue for automatic replacing, skipping...
<< Stage2 >> 3 files in queue for automatic 3-way merging, starting...
(1/5) /etc/genkernel.conf *Modified File
* Merge conflict(s) found, this file will be re-scheduled for manual updating.
Update canceled...
(2/5) /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx *Modified File
* Merge conflict(s) found, this file will be re-scheduled for manual updating.
Update canceled...
(3/5) /etc/mono/2.0/machine.config *Modified File
* Merge conflict(s) found, this file will be re-scheduled for manual updating.
Update canceled...
<< Stage3 >> 3 files in queue for manual 3-way merging, starting...
(1/5) /etc/genkernel.conf *Modified File
* YOU ARE ABOUT TO UPDATE A MODIFIED FILE WHICH PROBABLY CONTAINS
* CUSTOM SETTINGS. YOU ARE FORCED TO UPDATE MANUALLY!
Press [y] - to merge the current file and the ._cfg0000_* file with kdiff3
Press [s] - to skip this update (to investigate first, and try again later)
Press [q] - to quit cfg-update immediately
Merge manually with file : /etc/._cfg0000_genkernel.conf ? [y|s|q] y
In kdiff3 you select the lines that you want to keep.
When done, click the save button and exit kdiff3!
When you exit kdiff3, cfg-update will finish the update...
Merged result file /etc/genkernel.conf.merge not found...
No changes detected...
Press [1] - to replace the current file with the ._cfg0000_* file
Press [2] - to keep the current file and remove the ._cfg0000_* file
Press [u] - to undo and re-try merging the files later
Press [s] - to skip this update (to investigate first, and try again later)
Press [q] - to quit cfg-update immediately
How do you want to finish this update? [1|2|u|s|q] ^C
Code: Select all
kdesu -t "cfg-update -u -t /usr/kde/4.2/bin/kdiff3"Code: Select all
sudo cfg-update -u
Code: Select all
MERGE_TOOL = /usr/kde/4.2/bin/kdiff3Code: Select all
sudo cfg-update -uCode: Select all
cfg-update -u