Bug 156271
| Summary: | mergemaster(8) doesn't support -a and -i flags together | ||
|---|---|---|---|
| Product: | Documentation | Reporter: | Fedor Dikarev <fedor.dikarev> |
| Component: | Books & Articles | Assignee: | Doug Barton <dougb> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
Responsible Changed From-To: freebsd-doc->dougb Over to maintainer. Author: dougb Date: Sun Apr 10 03:53:06 2011 New Revision: 220512 URL: http://svn.freebsd.org/changeset/base/220512 Log: Update recommendation for mergemaster. The -a and -i options are exclusive. PR: docs/156271 Submitted by: Fedor Dikarev <fedor.dikarev@gmail.com> Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Sun Apr 10 03:49:53 2011 (r220511) +++ head/Makefile Sun Apr 10 03:53:06 2011 (r220512) @@ -65,7 +65,7 @@ # 6. `mergemaster -p' # 7. `make installworld' # 8. `make delete-old' -# 9. `mergemaster' (you may wish to use -U or -ai). +# 9. `mergemaster' (you may wish to use -i, along with -U or -F). # 10. `reboot' # 11. `make delete-old-libs' (in case no 3rd party program uses them anymore) # _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" State Changed From-To: open->patched Patched in HEAD, MFC ASAP. Thanks for letting us know about this. :) State Changed From-To: patched->closed MFC to RELENG_[78] is now complete. |
I've upgraded kernel on freebsd and have got some problem installing world with mergemaster: fe:test-backend{R}[20] ~$ head -n 63 /usr/src/Makefile | tail -n 6 # 6. `mergemaster -p' # 7. `make installworld' # 8. `make delete-old' # 9. `mergemaster' (you may wish to use -U or -ai). # 10. `reboot' # 11. `make delete-old-libs' (in case no 3rd party program uses them anymore) If I'm trying -ai options: fe:test-backend{R}[21] ~$ mergemaster -ai *** You have included the -a option along with one or more options that indicate that you wish mergemaster to actually make updates (-F, -U, or -i), however these options are not compatible. Please read mergemaster(8) for more information. And I've checked man 8 mergemaster: fe:test-backend{R}[22] ~$ man 8 mergemaster -a Run automatically. This option will leave all the files that differ from the installed versions in the temporary directory to be dealt with by hand. If the temproot directory exists, it creates a new one in a previously non-existent directory. This option unsets the verbose flag, and is not compatible with -i, -F, or -U. Setting -a makes -w superfluous. Should somebody change /usr/src/Makefile accordingly or I've misunderstood something?