Not merging changed files during an upgrade

amiramix

Member

Reaction score: 4
Messages: 93

I am upgrading 10.2 to 10.3. freebsd-update -r 10.3-RELEASE upgrade said that the following files have changed

Code:
/.cshrc
/.profile
/root/.cshrc
/root/.profile

and it won't be installing them. But actually didn't show any merge. Where the update or mergemaster store the new config files unpacked from 10.3 so that I can compare them with the current ones to check what has changed?
 
OP
amiramix

amiramix

Member

Reaction score: 4
Messages: 93

Many thanks, that will do. Looks like /var/db/freebsd-update stores just the fetched updates, but I remember there was a folder where it would store the files merged between the old and new releases.
 
OP
amiramix

amiramix

Member

Reaction score: 4
Messages: 93

BTW is there a way of restoring a file to its original, expected version, so that it's not skipped at the next upgrade?
 
Top