release: stop generating mergemaster databases
ClosedPublic
Actions

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

Tags

None

Referenced Files

	F108432895: D41797.id127562.diff
	Fri, Jan 24, 5:45 PM

	Unknown Object (File)
	Fri, Jan 17, 11:11 PM

	Unknown Object (File)
	Thu, Jan 9, 11:16 PM

	Unknown Object (File)
	Fri, Jan 3, 5:25 PM

	Unknown Object (File)
	Dec 10 2024, 9:06 AM

	Unknown Object (File)
	Dec 2 2024, 1:54 PM

	Unknown Object (File)
	Dec 2 2024, 1:51 PM

	Unknown Object (File)
	Dec 2 2024, 1:51 PM

View All 65 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

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

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
121	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

8 lines

tools/

vmimage.subr

5 lines

Diff 127562

View Options

release/Makefile