release: stop generating mergemaster databases
ClosedPublic
Actions

Authored by emaste on Sep 9 2023, 1:20 PM.

Tags

None

Referenced Files

	F102192804: D41797.diff
	Fri, Nov 8, 6:37 PM

	Unknown Object (File)
	Thu, Oct 31, 6:25 AM

	Unknown Object (File)
	Wed, Oct 16, 5:00 AM

	Unknown Object (File)
	Oct 2 2024, 7:59 AM

	Unknown Object (File)
	Sep 30 2024, 3:14 PM

	Unknown Object (File)
	Sep 23 2024, 10:16 AM

	Unknown Object (File)
	Sep 19 2024, 9:16 PM

	Unknown Object (File)
	Sep 19 2024, 4:20 PM

View All 48 Files

Subscribers

imp

jrtc27

Details

Reviewers

jhb
imp

Group Reviewers

releng

Commits

rG8ee478dfd46d: release: stop generating mergemaster databases

Summary

mergemaster was deprecated some time ago and will be removed from
FreeBSD 15.

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

emaste created this revision.Sep 9 2023, 1:20 PM

Herald added a subscriber: jrtc27. · View Herald TranscriptSep 9 2023, 1:20 PM

remove ifdef left behind

emaste added a subscriber: imp.Sep 9 2023, 1:46 PM

Does mergemaster have a deprecation warning in 14?

release/Makefile
125	I would also probably indent the comment. Could maybe use "bootstrap" instead of "initialize" to match the comment in the other file.

Deprecation notice was added in 398b12691b4f1

comment improvement from jhb

emaste mentioned this in D41799: beinstall: retire mergemaster support.Sep 9 2023, 4:19 PM

imp accepted this revision.Sep 9 2023, 4:28 PM

This revision is now accepted and ready to land.Sep 9 2023, 4:28 PM

Closed by commit rG8ee478dfd46d: release: stop generating mergemaster databases (authored by emaste). · Explain WhySep 20 2023, 11:30 AM

This revision was automatically updated to reflect the committed changes.

emaste added a commit: rG8ee478dfd46d: release: stop generating mergemaster databases.

Revision Contents
Changeset List

Path

Size

release/

Makefile

7 lines

tools/

vmimage.subr

5 lines

Diff 127174

View Options

release/Makefile