Bug 195507 - freebsd-update merge process lacks key features
Summary: freebsd-update merge process lacks key features
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 mailing list
Depends on:
Reported: 2014-11-29 19:35 UTC by Mel Pilgrim
Modified: 2016-12-21 15:27 UTC (History)
2 users (show)

See Also:


Note You need to log in before you can comment on or make changes to this bug.
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.