beinstall: retire mergemaster support
ClosedPublic
Actions

Authored by emaste on Sep 9 2023, 4:18 PM.

Tags

None

Referenced Files

	F102198551: D41799.diff
	Fri, Nov 8, 8:36 PM

	Unknown Object (File)
	Fri, Oct 18, 7:40 AM

	Unknown Object (File)
	Oct 1 2024, 4:34 AM

	Unknown Object (File)
	Sep 24 2024, 9:17 AM

	Unknown Object (File)
	Sep 20 2024, 12:45 AM

	Unknown Object (File)
	Sep 20 2024, 12:44 AM

	Unknown Object (File)
	Sep 20 2024, 12:44 AM

	Unknown Object (File)
	Sep 19 2024, 8:43 PM

View All 38 Files

Subscribers

imp

Details

Reviewers

jhb
0mp
kevans

Commits

rGb07689d1f2a2: beinstall: retire mergemaster support

Summary

Mergemaster will be removed shortly.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

Will also remove the references from beinstall.8

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

add man page update

jhb added inline comments.Apr 30 2024, 8:01 PM

usr.sbin/etcupdate/etcupdate.8
897 ↗	(On Diff #137462)	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?

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 ↗	(On Diff #137462)	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

Path

Size

share/

man/

man8/

beinstall.8

15 lines

tools/

build/

beinstall.sh

15 lines

Diff 138001

View Options

share/man/man8/beinstall.8