Bug 195507

Summary: freebsd-update merge process lacks key features
Product: Base System Reporter: Mel Pilgrim <ports.maintainer>
Component: binAssignee: freebsd-bugs mailing list <bugs>
Status: Closed Overcome By Events    
Severity: Affects Many People CC: emaste, ports.maintainer
Priority: ---    
Version: 10.0-RELEASE   
Hardware: Any   
OS: Any   

Description Mel Pilgrim 2014-11-29 19:35:25 UTC
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.
Comment 1 Mel Pilgrim 2016-12-21 13:21:59 UTC
Wow this is old. I don't even know if it's relevant anymore. Feel free to close it.