You are not logged in.

#1 2023-05-21 20:13:31

BackToUSSR
Member
Registered: 2023-05-17
Posts: 26

[SOLVED] Merging .pacnew after Git migration

Greetings!
I had no experience in merging .pacnew files before. I would like to know how, step by step, command by command, in the correct order, to complete all the steps described in the news about Git migration and do it correctly. Using nano. I'm afraid to break the system. Maybe it will be useful for newbies.

Last edited by BackToUSSR (2023-05-21 22:45:12)

Offline

#2 2023-05-21 20:15:37

ewaller
Administrator
From: Pasadena, CA
Registered: 2009-07-13
Posts: 20,652

Re: [SOLVED] Merging .pacnew after Git migration


Nothing is too wonderful to be true, if it be consistent with the laws of nature -- Michael Faraday
The shortest way to ruin a country is to give power to demagogues.— Dionysius of Halicarnassus
---
How to Ask Questions the Smart Way

Online

#3 2023-05-21 20:23:01

BackToUSSR
Member
Registered: 2023-05-17
Posts: 26

Re: [SOLVED] Merging .pacnew after Git migration

I visited this page, before writing this topic. There is no required procedure due to the current update. I'd like to get the correct order of operations and list of commands for a safe upgrade. I haven't run the update or merger process yet. I would be happy to list the commands in their correct order If possible. Thanks.

Last edited by BackToUSSR (2023-05-21 20:30:29)

Offline

#4 2023-05-21 20:40:01

seth
Member
From: Won't reply 2 private help req
Registered: 2012-09-03
Posts: 76,244

Re: [SOLVED] Merging .pacnew after Git migration

There's nothing specific, it's a pacnew merge like every other.

Offline

#5 2023-05-21 20:45:47

BackToUSSR
Member
Registered: 2023-05-17
Posts: 26

Re: [SOLVED] Merging .pacnew after Git migration

seth wrote:

There's nothing specific, it's a pacnew merge like every other.

1) $ sudo pacman -Syu
2) Merge .pacnew using pacdiff
3) $ sudo pacman -Syu "pacman>=6.0.2-7"

This is the correct course of action? As I pointed out at the beginning, I have not come across this before.

Last edited by BackToUSSR (2023-05-21 20:48:28)

Offline

#6 2023-05-21 20:47:20

loqs
Member
Registered: 2014-03-06
Posts: 18,961

Re: [SOLVED] Merging .pacnew after Git migration

Step 3 is not required.
Edit:
Or it should replace step 1.  In either case their are only 2 steps.

Last edited by loqs (2023-05-21 20:48:13)

Offline

#7 2023-05-21 20:52:10

ewaller
Administrator
From: Pasadena, CA
Registered: 2009-07-13
Posts: 20,652

Re: [SOLVED] Merging .pacnew after Git migration

We generally don't provide step by step instructions here.   We are happy to provide answers to your specific questions.
I assert that pacdiff, referenced by the linked page, will suit your needs.

You seem a bit reticent to change the configuration files; my bet is that you never have.  If not, there may not even be a pacnew file.   If not, you are golden.

I also like the use of locate as described in the linked page.  Set it up and ensure it is working.  then do your system update then run updatedb.  Then locate pacnew to get a list of files you need to address.   Use diff to compare those pacnew files with their original files (the same name without the .pacnew.)   Then you get to decide what changes you have made what you want to keep -- we have no way to know what changes you have made..   It might be safe just to copy to .pacnew files and overwrite the files you had updated.


Nothing is too wonderful to be true, if it be consistent with the laws of nature -- Michael Faraday
The shortest way to ruin a country is to give power to demagogues.— Dionysius of Halicarnassus
---
How to Ask Questions the Smart Way

Online

#8 2023-05-21 22:19:35

BackToUSSR
Member
Registered: 2023-05-17
Posts: 26

Re: [SOLVED] Merging .pacnew after Git migration

Merged /etc/pacman.conf.pacnew with /etc/pacman.conf using meld. It's not as difficult as I feared.

Do I understand correctly that it was possible to do without merging by simply making the preferred settings in .pacnew, and then simply executing:
$ sudo mv /etc/pacman.conf.pacnew /etc/pacman.conf ?

Offline

#9 2023-05-21 22:33:40

dakota
Member
Registered: 2016-05-20
Posts: 417

Re: [SOLVED] Merging .pacnew after Git migration

BackToUSSR wrote:

Do I understand correctly that it was possible to do without merging by simply making the preferred settings in .pacnew, and then simply executing:
$ sudo mv /etc/pacman.conf.pacnew /etc/pacman.conf ?

Yes.

Although I would first execute...

$ sudo mv /etc/pacman.conf /etc/pacman.conf.old

... so I had a backup file with the original settings in case I made a mistake.

Last edited by dakota (2023-05-21 22:34:31)


"Before Enlightenment chop wood, carry water. After Enlightenment chop wood, carry water." -- Zen proverb

Offline

#10 2023-05-21 22:41:23

BackToUSSR
Member
Registered: 2023-05-17
Posts: 26

Re: [SOLVED] Merging .pacnew after Git migration

dakota wrote:
BackToUSSR wrote:

Do I understand correctly that it was possible to do without merging by simply making the preferred settings in .pacnew, and then simply executing:
$ sudo mv /etc/pacman.conf.pacnew /etc/pacman.conf ?

Yes.

Although I would first execute...

$ sudo mv /etc/pacman.conf /etc/pacman.conf.old

... so I had a backup file with the original settings in case I made a mistake.


Thanks for reply!

Last edited by BackToUSSR (2023-05-21 22:42:19)

Offline

#11 2023-05-21 23:03:48

luser
Member
Registered: 2016-08-27
Posts: 115

Re: [SOLVED] Merging .pacnew after Git migration

In the Arch Linux announcements page, it says to run:

sudo pacman -Syu "pacman>=6.0.2-7"

but when I try it, the result is:

error: target not found: pacman>=6.0.2-7

Can I safely assume that the announcement was a little premature, and that the pacman package will be updated soon?


luser: an epithet applied by Windows users to linux users

Offline

#12 2023-05-21 23:13:54

Scimmia
Fellow
Registered: 2012-09-01
Posts: 13,727

Re: [SOLVED] Merging .pacnew after Git migration

luser wrote:

In the Arch Linux announcements page, it says to run:

sudo pacman -Syu "pacman>=6.0.2-7"

but when I try it, the result is:

error: target not found: pacman>=6.0.2-7

Can I safely assume that the announcement was a little premature, and that the pacman package will be updated soon?

You can safely assume that your mirror hasn't synced yet. As the announcement said:

Mirrors are syncing again, but it may take a bit of time until your mirror of choice has caught up.

Offline

Board footer

Powered by FluxBB