From owner-freebsd-hackers@freebsd.org Wed Jun 6 08:49:21 2018 Return-Path: Delivered-To: freebsd-hackers@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 906B8FED6DB for ; Wed, 6 Jun 2018 08:49:21 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id 2633F6B07D for ; Wed, 6 Jun 2018 08:49:21 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mailman.ysv.freebsd.org (Postfix) id D4F4CFED6DA; Wed, 6 Jun 2018 08:49:20 +0000 (UTC) Delivered-To: hackers@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2CD9FED6D9 for ; Wed, 6 Jun 2018 08:49:20 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mail-wm0-x235.google.com (mail-wm0-x235.google.com [IPv6:2a00:1450:400c:c09::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48AB46B07C for ; Wed, 6 Jun 2018 08:49:19 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mail-wm0-x235.google.com with SMTP id p126-v6so9982730wmb.2 for ; Wed, 06 Jun 2018 01:49:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuxi-nl.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to:cc; bh=i8i9YitCaD54nJVakiHM5pHehb2BAXZAKc8iqD4Jzvo=; b=hpP4Ehbpp9woC4mCdWbjnNC9hR1/GJZ0+9EF+5FpHX8ljQDCJly3HDi3/AmteeMNA/ VqFai2pOhlV037SyosuZTHdgyHoGUKadPQ04L4kndpSl5mTxdnbA+s9/T8/9dXXyShQp Kkx/nurWflg6qtJsk2zo1H5Ei3fZ2QDwM/qocgz94yG2moPx34VSJa0IU48RUaRCVBUb hkUZMnD61n/8GIijXp3Gy6ci1+4WTFXw/3G4KZcI3MzGaRX8afonjdVJIGJBuh5B5YqE JnE7P9zX5wxT4bPmm6VnZfKJa+xyf8glAyz715WCAETek4YTfhbpGly664WC2RXiZgZO loxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=i8i9YitCaD54nJVakiHM5pHehb2BAXZAKc8iqD4Jzvo=; b=RhEM9eZmrZWSXqKZe9j7hsU7vkSTNuCMwNo41dIQJnqIWxUg81DVc+aAV4Wk51hvMm IAvEmYXdMw8/lTt0yKHyKoIL1kY9QOQVaaHFJsQBcNDr4Qhtde4J5pExEB4B4yfoavwY A3rnDEL6Ha0Qx1waiwQcDF5GU/DLBSvsuzv6d2fTTz6vY2Qeke10FuzGpeiX3+geeGoT NS1fGV6Cyoa2zX9r5sWWEfO3IoPwJpp1wX7fFa9fDWGzJy+TUcbRjFzFXyi+Am1H5ntd lc+fx007pBabeQ3VExQ533imzUkr4C6Lv9r7eotpSUNaa23BmR9ARpBEKBg6SE2DKmj3 VQmQ== X-Gm-Message-State: APt69E2+dCuC2nsqDAH/z2H4zmqYNTB1e5TJRTGA/UfqQd4vJINsYsTJ xJaO3K9Sfz2ULF/Fs6eJoFzNo0BehejHvj5McKYvd8U2 X-Google-Smtp-Source: ADUXVKKXgQgKKjybg7ZdyJ45QolAqO5fpsRY3AieUqPA1+uRXDcHy7f4vCmSBVP11Yv8EeUzxagqoRb+fBs8H1Bwepg= X-Received: by 2002:a50:88c3:: with SMTP id d61-v6mr2829084edd.122.1528274958122; Wed, 06 Jun 2018 01:49:18 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a50:8e0d:0:0:0:0:0 with HTTP; Wed, 6 Jun 2018 01:48:47 -0700 (PDT) From: Ed Schouten Date: Wed, 6 Jun 2018 10:48:47 +0200 Message-ID: Subject: Cleanest way of merging back changes to syslogd(8)? To: hackers@freebsd.org Cc: Dave Cottlehuber Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2018 08:49:21 -0000 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 Nuxi, 's-Hertogenbosch, the Netherlands