[Nagiosplug-devel] cvs branches
Karl DeBisschop
karl at debisschop.net
Tue Mar 4 23:36:16 CET 2003
On Wed, 2003-03-05 at 00:03, Subhendu Ghosh wrote:
> I committed the check_ntp regex and the modified command.cfg to the r1_3_0
> branch rather than the mainline so they would get included in a patched
> release.
>
> I'll merge them into the mainline next month.
Why are you waiting to merge?
My experience is that only increases the chance of a conflict.
Since it can be backed out, I went ahead and did the merge:
$ cvs update -j r1_3_0 check_ntp.pl
$ cvs commit -m'add "m" to regex for minutes' check_ntp.pl
--
Karl
More information about the Devel
mailing list