Page MenuHomeFreeBSD
Differential D38896

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

Authored by emaste on Mar 3 2023, 5:37 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Nov 19, 4:01 PM
Unknown Object (File)
Tue, Nov 18, 5:07 AM
Unknown Object (File)
Sat, Nov 15, 11:26 PM
Unknown Object (File)
Sat, Nov 8, 3:11 AM
Unknown Object (File)
Thu, Nov 6, 1:27 AM
Unknown Object (File)
Sat, Nov 1, 6:13 AM
Unknown Object (File)
Sat, Nov 1, 6:07 AM
Unknown Object (File)
Oct 26 2025, 2:29 PM
View All 97 Files
Subscribers
imp

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

Revision Contents
Changeset List

PathSize
usr.sbin/
freebsd-update/
9 lines

Diff 129015

View Options

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

Loading...