Pacman 6 got released: Requires manual intervention

Announcements
17

I'll post this here in case it's useful to people. I use this as a "safe" way to graphically merge:

#!/usr/bin/bash
set -euo pipefail

for i in $(/usr/bin/pacdiff --output); do
	echo "Merging $i ..."
	SUDO_EDITOR=/usr/bin/meld /usr/bin/sudo -e "$i" "${i/.pacnew/}"
done

(And yes, you can replace meld with kompare. :stuck_out_tongue_winking_eye:)

On the other hand, if you don't have sudo but do have gvfs, then:

#!/usr/bin/bash
set -euo pipefail

for i in $(/usr/bin/pacdiff --output); do
	echo "Merging $i ..."
	/usr/bin/meld "admin://$i" "admin://${i/.pacnew/}"
done

Save your choice as a script, make it executable, and it will iterate through all pacnew files and compare them. You can then remove the pacnew afterwards.

13 Likes