]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e3622b0) | patch
mergemaster: handle symbolic links during update.
authorimp <imp@FreeBSD.org>
Wed, 18 Nov 2020 19:22:24 +0000 (19:22 +0000)
committerimp <imp@FreeBSD.org>
Wed, 18 Nov 2020 19:22:24 +0000 (19:22 +0000)
commit4349a88b663a329939ddf87f885c67ac4ddaefa5
treefa4715a1bbfb045c77d4357b8f4b93b166724862tree | snapshot
parente3622b0065999d06c134163ed7fbd9c0d658b9dfcommit | diff
mergemaster: handle symbolic links during update.

/etc/os-release is now a symbolic link to a generated file. Make
mergemaster cope with symbolic links generically. I'm no longer
a big mergemaster user, so this has only been lightly tested
by me, though Kimura-san has ran it through its paces.

Submitted by: Yasushiro KIMURA-san
PR: 242212
MFC After: 2 weeks
usr.sbin/mergemaster/mergemaster.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.