Date: Wed, 13 Jun 2018 15:45:40 +0200 From: Ed Schouten <ed@nuxi.nl> To: Dimitry Andric <dim@freebsd.org> Cc: hackers@freebsd.org, Dave Cottlehuber <dch@skunkwerks.at> Subject: Re: Cleanest way of merging back changes to syslogd(8)? Message-ID: <CABh_MKkFsQ%2BGPvxyLUqiU48owE7vg2mb9-=MFiAWUuoT1MKpWA@mail.gmail.com> In-Reply-To: <AFD47305-EA3F-4E31-A3D5-DC6C10EBBB77@FreeBSD.org> References: <CABh_MKkFCgMEQzGWmXb9=Dr_93V%2BTx6yvtOD-i1%2BzhrktnSS3Q@mail.gmail.com> <AFD47305-EA3F-4E31-A3D5-DC6C10EBBB77@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Dimitry, 2018-06-06 11:21 GMT+02:00 Dimitry Andric <dim@freebsd.org>: > The svn:mergeinfo property on the usr.sbin/syslogd directory will have > to be moved to the root of the stable/11 tree, I'm not sure off the top > of my head how that should be done. I did some searching around and it turns out that "svn mergeinfo --show-revs eligible" can be used to get a list of commits that "svn merge" would in fact try to merge back. By then running "svn merge" at the root of the repository with that list of commits, I was able to merge this back in such a way that the mergeinfo remains at the top of the tree. I've completed the merge in r335059. Thanks for your input Dimitry! Best regards, -- 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_MKkFsQ%2BGPvxyLUqiU48owE7vg2mb9-=MFiAWUuoT1MKpWA>