Date: Wed, 6 Jun 2018 10:48:47 +0200 From: Ed Schouten <ed@nuxi.nl> To: hackers@freebsd.org Cc: Dave Cottlehuber <dch@skunkwerks.at> Subject: Cleanest way of merging back changes to syslogd(8)? Message-ID: <CABh_MKkFCgMEQzGWmXb9=Dr_93V%2BTx6yvtOD-i1%2BzhrktnSS3Q@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
Hi there, Some time ago, Dave (cc) asked me whether I'd be interested in merging back the RFC 5424 / ISO 8601 message format changes I made to syslogd(8) to stable/11. Now that stable/11 is open again, I thought I'd go and take a look at doing this. It turns out that merging these changes back is quite challenging. The copy of syslogd(8) in HEAD has diverged very strongly over the last couple of years. There have also been some direct commits to stable/11, so it seems to be (practically) impossible to come up with an invocation of 'svn merge' that does what I expect it would. Because of this, I am considering syncing syslogd(8) between stable/11 and HEAD entirely. More concrete, I want to do this: stable-11 $ cp ../head/usr.sbin/syslogd/* usr.sbin/syslogd/ stable-11 $ svn revert usr.sbin/syslogd/Makefile.depend stable-11 $ svn commit My question is, what's the right way of doing this with SVN (e.g., w.r.t. mergeinfo)? Thanks, -- Ed Schouten <ed@nuxi.nl> Nuxi, 's-Hertogenbosch, the Netherlands
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CABh_MKkFCgMEQzGWmXb9=Dr_93V%2BTx6yvtOD-i1%2BzhrktnSS3Q>