[Bug 195507] New: freebsd-update merge process lacks key features

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


            Bug ID: 195507
           Summary: freebsd-update merge process lacks key features
           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

The merge-in-editor feature of freebsd-update's merge tool is quite good.  It
does, however, lack important features:

- side-by-side chunk-wise change selection without using an editor
- option to outright replace the old file with the new file
- option to retain the old file entirely

These features are present in mergemaster.  Freebsd-update's merge tool is a
significant regression.

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

More information about the freebsd-bugs mailing list