From owner-freebsd-hackers@freebsd.org Wed Jun 13 13:46:15 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 DC5E3100CACA for ; Wed, 13 Jun 2018 13:46:14 +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 7471283F1B for ; Wed, 13 Jun 2018 13:46:14 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mailman.ysv.freebsd.org (Postfix) id 352A2100CAC0; Wed, 13 Jun 2018 13:46:14 +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 228EC100CABE for ; Wed, 13 Jun 2018 13:46:14 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) (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 86C9483F18 for ; Wed, 13 Jun 2018 13:46:12 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mail-wm0-x22f.google.com with SMTP id p11-v6so5527414wmc.4 for ; Wed, 13 Jun 2018 06:46:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuxi-nl.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=/lCr2brtWu3Oj0J5GWvM2AzXAwFvt7Kfl2N10f/bRqc=; b=KqrHQkwT6utX5P2Zy/vBZ9GmG3l48EpaTU88MB3qwG+ozfyNsU4K9AKRhu1GPpYw70 1ZdyQbVltur0akRX/awf5+arvPvYDf//zPg9Se/ZxB+avkJzBeS3NgWS6plzQth7qxE/ EULqc2hOv80fr42boBgGx/aJIh0+3+EQBuuHB8vDuu+98fxef52+q1mW5C1Ds/8LtENQ GAorwkd0Jt6YaXP6NKRnhe+JStwRZONqiKKtLvbU8VsoY15j9l8EjB+NrTkG+0LYdnKk GEiqVuzyPmW/KsWE/dZNTYy72XTamA7dKBHtDxymZttUY+v+eOc0IUKdMnOPESYAImJZ G7UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=/lCr2brtWu3Oj0J5GWvM2AzXAwFvt7Kfl2N10f/bRqc=; b=m9g8c21plaSCK+qbjQlSCDHvwD3Xy6qUMQOOdfWnpvMPQLmo7svs4iJQQih3EGwwDn iyXQ+WmhZcXJHqCfEmYkyJlxWYTjRtVPX4UecCbk4LXGg3epZN9VdbyHAj7Jcn8cM7La 0Q2JbrO7C56M+5labRW/ZxwMWMHu0s5shPnpfgsReo1qhTwH5sPQz7Fip1jVkajHOmeJ u9fdJTyrqvtNPUKZ7yv0TG8llPhTatDFhVcx7kNhZ3EoO0xwHeyez1YafsR1XoaDM272 XXWAVUiCqwXVuxWr0BhS43RP1RI5Lvfmz1HH4Txj3IKu9hRxI+3lRdXVllFiuLkBi1rn QiAQ== X-Gm-Message-State: APt69E1s2Nt0lJIQPAxSSptWFLemKoBVhzv9M+LsR1rh8RjVbqcnm45g 5bKNKl5NV2Di7SXDv55ozy/JrD0iNwW2H61dEZEkOQ== X-Google-Smtp-Source: ADUXVKJl+8KPbTmLxdgqiQvptjiYnXj0vh3fQ8UkLHhNjkkPLwq5waqBZ04BR9fjmUw7Z1ytvBef7uoG6fs4vfxSDmE= X-Received: by 2002:aa7:c542:: with SMTP id s2-v6mr4175686edr.224.1528897571204; Wed, 13 Jun 2018 06:46:11 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a50:8e0d:0:0:0:0:0 with HTTP; Wed, 13 Jun 2018 06:45:40 -0700 (PDT) In-Reply-To: References: From: Ed Schouten Date: Wed, 13 Jun 2018 15:45:40 +0200 Message-ID: Subject: Re: Cleanest way of merging back changes to syslogd(8)? To: Dimitry Andric Cc: hackers@freebsd.org, 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, 13 Jun 2018 13:46:15 -0000 Hi Dimitry, 2018-06-06 11:21 GMT+02:00 Dimitry Andric : > 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 Nuxi, 's-Hertogenbosch, the Netherlands