[Bug 195506] New: freebsd-update merge process quits instead of retrying a merge

bugzilla-noreply at freebsd.org bugzilla-noreply at freebsd.org
Sat Nov 29 19:29:42 UTC 2014


            Bug ID: 195506
           Summary: freebsd-update merge process quits instead of retrying
                    a merge
           Product: Base System
           Version: 10.0-RELEASE
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Many People
          Priority: ---
         Component: bin
          Assignee: freebsd-bugs at FreeBSD.org
          Reporter: ports.maintainer at evilphi.com

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.

You are receiving this mail because:
You are the assignee for the bug.

More information about the freebsd-bugs mailing list