Bug 195506 - freebsd-update merge process quits instead of retrying a merge
Summary: freebsd-update merge process quits instead of retrying a merge
Status: Closed Overcome By Events
Alias: None
Product: Base System
Classification: Unclassified
Component: bin (show other bugs)
Version: 10.0-RELEASE
Hardware: Any Any
: --- Affects Many People
Assignee: freebsd-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-11-29 19:29 UTC by ports.maintainer
Modified: 2016-12-21 15:26 UTC (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description ports.maintainer 2014-11-29 19:29:42 UTC 
When doing the manual merges, freebsd-update asks you to confirm the merges look correct after you've done all of them.  If you answer 'n' to any one of the confirmation, freebsd-update exits entirely.  This forces you to restart the entire process (including all of the manual merges).

This is a significant regression compared to mergemaster.  During a major-revision upgrade, this can be a very large amount of time wasted.

Freebsd-update should prompt to confirm each merge after you've done just that merge.  If you answer 'y', proceed to the next merge.  If you answer 'n', redo the merge of just that file.
Comment 1 ports.maintainer 2016-12-21 13:21:51 UTC 
Wow this is old. I don't even know if it's relevant anymore. Feel free to close it.