Diffusion FreeBSD src repository 3d4424154617

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

Description

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

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
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Fixes: ceb5f28ba5fc ("freebsd-update: re-edit files if merge confli...")
Differential Revision: https://reviews.freebsd.org/D38896

Details

Provenance

emaste

Authored on Mar 3 2023, 5:32 PM

Reviewer

rGceb5f28ba5fc: freebsd-update: re-edit files if merge conflict markers remain

Differential Revision

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

Parents

rG3b5c9845727a: Remove $FreeBSD$: one line sh-pattern

Branches

Unknown

Tags

Unknown

Event Timeline

emaste committed rG3d4424154617: freebsd-update: allow user to break out of conflict resolution loop (authored by emaste).Oct 18 2023, 4:17 PM

emaste added an edge: D38896: freebsd-update: allow user to break out of conflict resolution loop.

emaste mentioned this in rG6561fec386a6: freebsd-update: allow user to break out of conflict resolution loop.Oct 23 2023, 11:37 PM

emaste mentioned this in rG72e6ffc21cc9: freebsd-update: allow user to break out of conflict resolution loop.Jan 7 2024, 9:27 PM

Changes (1)

Path

Size

usr.sbin/

freebsd-update/

freebsd-update.sh

rG3d4424154617

View Options

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