freebsd-update: allow user to break out of conflict resolution loop
ClosedPublic
Actions

Authored by emaste on Mar 3 2023, 5:37 PM.

Details

Reviewers

thogard_abnormal.com
delphij
cperciva
imp

Commits

rG72e6ffc21cc9: freebsd-update: allow user to break out of conflict resolution loop
rG6561fec386a6: freebsd-update: allow user to break out of conflict resolution loop
rG3d4424154617: freebsd-update: allow user to break out of conflict resolution loop

Summary

When a conflict marker is found during update allow the user to confirm
they want it to remain in the file.

Suggested by: Tim Hogard
Fixes: ceb5f28ba5fc ("freebsd-update: re-edit files if merge confli...")
Sponsored by: The FreeBSD Foundation

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

emaste requested review of this revision.Mar 3 2023, 5:37 PM

emaste created this revision.

emaste added a reviewer: cperciva.Mar 6 2023, 5:09 PM

emaste added inline comments.Oct 18 2023, 4:14 PM

usr.sbin/freebsd-update/freebsd-update.sh
2562–2563	perhaps "carry on with these lines remaining in the file." just to make it explicit.

either wording. I like this.

This revision is now accepted and ready to land.Oct 18 2023, 4:15 PM

Closed by commit rG3d4424154617: freebsd-update: allow user to break out of conflict resolution loop (authored by emaste). · Explain WhyOct 18 2023, 4:18 PM

This revision was automatically updated to reflect the committed changes.

emaste added a commit: rG3d4424154617: freebsd-update: allow user to break out of conflict resolution loop.

emaste added a commit: rG6561fec386a6: freebsd-update: allow user to break out of conflict resolution loop.Oct 23 2023, 11:37 PM

emaste added a commit: rG72e6ffc21cc9: freebsd-update: allow user to break out of conflict resolution loop.Jan 7 2024, 9:28 PM

Revision Contents
Changeset List

Path

Size

usr.sbin/

freebsd-update/

freebsd-update.sh

9 lines

Diff 129015

View Options

usr.sbin/freebsd-update/freebsd-update.sh

freebsd-update: allow user to break out of conflict resolution loopClosedPublicActions