mergemaster: better defaults for SOURCEDIR
ClosedPublic
Actions

Authored by imp on Aug 14 2018, 2:38 PM.

Details

Reviewers

vangyzen
asomers
allanjude

Summary

mergemaster: better defaults for SOURCEDIR

If we can't find a Makefile.inc1 in the specified / default SOURCEDIR, and
there's a Makefile.inc1 in the current directory, offer the user the choice
of using . for SOURCEDIR.

Diff Detail

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 18793
Build 18459: arc lint + arc unit

Event Timeline

imp created this revision.Aug 14 2018, 2:38 PM

Harbormaster completed remote builds in B18788: Diff 46662.Aug 14 2018, 2:38 PM

vangyzen accepted this revision.Aug 14 2018, 3:03 PM

vangyzen added a subscriber: vangyzen.

vangyzen added inline comments.

usr.sbin/mergemaster/mergemaster.sh
490	I don't often see "default" used as a verb, but it works.

This revision is now accepted and ready to land.Aug 14 2018, 3:03 PM

I use mergemaster the same way. Apart from the "default" word choice, this revision LGTM.

usr.sbin/mergemaster/mergemaster.sh
490	It seems inappropriate to describe a setting that only applies to a single invocation as the "default".

imp added inline comments.Aug 14 2018, 3:31 PM

usr.sbin/mergemaster/mergemaster.sh
490	Blah blah blah defaults to blah uses default as a verb. I see it all the time. :) However 'to set SOURCEDIR to' likely is better wording since it matches what the program is doing