Page MenuHomeFreeBSD
Differential D41799

beinstall: retire mergemaster support
ClosedPublic
Actions

Authored by emaste on Sep 9 2023, 4:18 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Feb 8, 3:46 AM
Unknown Object (File)
Sun, Feb 8, 3:44 AM
Unknown Object (File)
Sat, Feb 7, 10:02 PM
Unknown Object (File)
Sat, Jan 31, 11:16 AM
Unknown Object (File)
Jan 5 2026, 6:41 AM
Unknown Object (File)
Dec 25 2025, 5:33 PM
Unknown Object (File)
Nov 29 2025, 9:13 PM
Unknown Object (File)
Nov 29 2025, 5:26 PM
View All Files
Subscribers
imp

Details

Reviewers
jhb
0mp
kevans
Commits
rGb07689d1f2a2: beinstall: retire mergemaster support
Summary

Mergemaster will be removed shortly.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste requested review of this revision.Sep 9 2023, 4:18 PM
emaste created this revision.

Will also remove the references from beinstall.8

emaste added a comment.Sep 9 2023, 4:19 PM

MM database removal in D41797

emaste added a subscriber: imp.Sep 9 2023, 5:12 PM
emaste added a reviewer: kevans.Sep 21 2023, 12:13 AM
emaste updated this revision to Diff 137462.Apr 21 2024, 5:22 PM

add man page update

jhb added inline comments.Apr 30 2024, 8:01 PM
usr.sbin/etcupdate/etcupdate.8
897

Removing the Xr here doesn't seem to be specific to beinstall? Presumably this would be part of a future commit to remove mergemaster entirely?

kevans accepted this revision.Apr 30 2024, 8:04 PM

The beinstall specific bits LGTM

This revision is now accepted and ready to land.Apr 30 2024, 8:04 PM
emaste added inline comments.Apr 30 2024, 8:08 PM
usr.sbin/etcupdate/etcupdate.8
897

Yeah I think this accidentally crept in after a rebase, I will not commit with the beinstall change

Closed by commit rGb07689d1f2a2: beinstall: retire mergemaster support (authored by emaste). · Explain WhyMay 1 2024, 11:03 PM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rGb07689d1f2a2: beinstall: retire mergemaster support.

Revision Contents
Changeset List

PathSize
share/
man/
man8/
15 lines
tools/
build/
15 lines
usr.sbin/
etcupdate/
1 line

Diff 137462

View Options

share/man/man8/beinstall.8

Loading...
View Options

tools/build/beinstall.sh

Loading...
View Options

usr.sbin/etcupdate/etcupdate.8

Loading...