Date: Mon, 11 Aug 2014 11:09:22 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-bugs@FreeBSD.org Subject: [Bug 192577] New: Allow user of 'mergemaster' to automatically install files that differ only in comments Message-ID: <bug-192577-8@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192577 Bug ID: 192577 Summary: Allow user of 'mergemaster' to automatically install files that differ only in comments Product: Base System Version: 10.0-STABLE Hardware: Any OS: Any Status: Needs Triage Severity: Affects Many People Priority: --- Component: misc Assignee: freebsd-bugs@FreeBSD.org Reporter: yuri@rawbw.com Created attachment 145658 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=145658&action=edit patch Makefile recommends to always run mergemaster after system update from source. However, there are often a lot of files only having minor differences in comments. For example, those only with the change in $FreeBSD: xxx template. Such files require the user to choose 'i' again and again, often many times. The attached patch solves this problem. It offers the user the new option 'a', which would automatically accept all further files that differ only in comments. -- You are receiving this mail because: You are the assignee for the bug.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-192577-8>