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)
Fri, May 15, 4:01 PM
Unknown Object (File)
Fri, May 15, 3:44 PM
Unknown Object (File)
Thu, May 14, 4:31 PM
Unknown Object (File)
Thu, May 14, 3:50 PM
Unknown Object (File)
Thu, May 14, 3:49 PM
Unknown Object (File)
Sun, May 10, 9:12 AM
Unknown Object (File)
Thu, May 7, 10:14 AM
Unknown Object (File)
Wed, May 6, 12:23 AM
View All 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...