Differential D7401

Use diff3 instead of merge for etcupdate
ClosedPublic
Actions

Authored by bapt on Aug 2 2016, 10:32 PM.

Details

Reviewers

jhb

Commits

rS303784: etcupdate: directly use diff3(1) instead of merge(1)

Summary

merge(1) being part of GNU rcs which we plan to remove using diff3 allows to
remove GNU rcs from base

Test Plan

Passes the regression test

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 4690
Build 4744: arc lint + arc unit

Event Timeline

bapt updated this revision to Diff 18979.Aug 2 2016, 10:32 PM

bapt retitled this revision from to Use diff3 instead of merge for etcupdate.

bapt updated this object.

bapt edited the test plan for this revision. (Show Details)

bapt added a reviewer: jhb.

Herald added a subscriber: imp. · View Herald TranscriptAug 2 2016, 10:32 PM

jhb added inline comments.Aug 2 2016, 10:41 PM

usr.sbin/etcupdate/etcupdate.sh
823	We should update the log message.
838	I think you can avoid mktemp in this case. Instead, remove the 'cp' above this (and log of 'cp') and do: diff3 -m -A ... \ ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > \ ${CONFLICTS}$1

Address jhb comments

Have you run the etcupdate tests? If those pass (it tests conflict generation, etc.) then this looks good to me. Thanks!

After this I think you can also update the usr.bin/Makefile to not exclude etcupdate due to WITHOUT_RCS

This revision is now accepted and ready to land.Aug 3 2016, 3:32 PM

Closed by commit rS303784: etcupdate: directly use diff3(1) instead of merge(1) (authored by bapt). · Explain WhyAug 5 2016, 7:22 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

usr.sbin/

etcupdate/

etcupdate.sh

16 lines

Diff 18983

View Options

usr.sbin/etcupdate/etcupdate.sh

Use diff3 instead of merge for etcupdateClosedPublicActions