HomeFreeBSD

freebsd-update: handle directories changing to files

Description

freebsd-update: handle directories changing to files

Further to f6d37c9ca13f ("freebsd-update: handle file -> directory on
upgrade"), handle the reverse case of a directory changing to a file.
We may not encounter this case on upgradess (before freebsd-update is
retired) but it is needed to support rollback.

PR: 273950
Reviewed by: dim
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D41945

(cherry picked from commit c0f52443166ae7ecd512ab0350469d9c3648788c)
(cherry picked from commit 1cf8528fec85a965baa5df2d8852166437af88a6)

Details

Provenance
emasteAuthored on Sep 12 2023, 2:59 AM
Reviewer
dim
Differential Revision
D41945: freebsd-update: handle directories changing to files, too
Parents
rG72e6ffc21cc9: freebsd-update: allow user to break out of conflict resolution loop
Branches
Unknown
Tags
Unknown