From owner-freebsd-hackers@freebsd.org Fri Jul 10 20:39:55 2020 Return-Path: Delivered-To: freebsd-hackers@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 48E9F3731A5 for ; Fri, 10 Jul 2020 20:39:55 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from mx0b-00273201.pphosted.com (mx0b-00273201.pphosted.com [67.231.152.164]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.pphosted.com", Issuer "Thawte RSA CA 2018" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3Pzt0bZMz3ds3; Fri, 10 Jul 2020 20:39:53 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from pps.filterd (m0108163.ppops.net [127.0.0.1]) by mx0b-00273201.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06AJCiTB028183; Fri, 10 Jul 2020 12:22:09 -0700 Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2174.outbound.protection.outlook.com [104.47.58.174]) by mx0b-00273201.pphosted.com with ESMTP id 325k32vb19-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Jul 2020 12:22:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=li0g4+LgmWwK8oxu2AW6U7ODi1ItAM/9uflb+/WjQLky180WdQOeZ8mgdxVUDQOPsH9zNUrcSxQ+OzcqzFNLG51V0JRcwZMQSDPxnUGcqb2GmNhzjt72HFuUmfHmIAJVU9uMBS+uaXIBBVxtpYdDZ4V6PsIz3G8fWXjpY3ZMOnruouCsLv9WMntsycI+VhbdDAlXwedemt7OX71ILbZ7UbHiCY20Ejn1xtSUxQPJ6INNlygdBsVGJonOdopwDJCO6d1Txkwe9544N49fT52yxVyE4pxxCyz9xFivXQwyD7Vsqc7aBXciI1Bv7aNq4fZI1jhYmBkPJyz/oxeopeepEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6K2SbsqL8u2swCSXuAjfHFcy+Yu1EuDf7T3x4zrAsng=; b=aR0viDUvsm+X0fXtFgmNMM4m512cKeMJonoT084PPay/XL+VS4gH59PcruU1rxf9amuFTkWjGwrsiaZJcjzEjArT4ow4qsVju71b/xSzH/eXA46HlVehMxjD7T/xTvkztSu21FyvW7kpLqgo2oU992S04R1JIsVQPhRVqUE2OG6zg1Z/ulR5DvRjl83yTivI3O0Ix3FXCppP2/0HeMilIT8h1MmVRNtd1vXXYePSq9yvZ9T4JOuwmhZ/PnT7mG2R0EThCx55Fomc8JF2fFdrfN9ZyAf1NYs3PkJrqJOEYb1i3H2tAkBe3YnILoUdqr9hAQuqbifO+a5bKt8Bc11V8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.239.13) smtp.rcpttodomain=freebsd.org smtp.mailfrom=juniper.net; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=juniper.net; dkim=none (message not signed); arc=none Received: from DM5PR19CA0001.namprd19.prod.outlook.com (2603:10b6:3:151::11) by SN6PR05MB3949.namprd05.prod.outlook.com (2603:10b6:805:24::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.9; Fri, 10 Jul 2020 19:22:08 +0000 Received: from DM3NAM05FT020.eop-nam05.prod.protection.outlook.com (2603:10b6:3:151:cafe::1) by DM5PR19CA0001.outlook.office365.com (2603:10b6:3:151::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Fri, 10 Jul 2020 19:22:08 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.239.13) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none;freebsd.org; dmarc=fail action=oreject header.from=juniper.net; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.13 as permitted sender) Received: from P-EXFEND-EQX-02.jnpr.net (66.129.239.13) by DM3NAM05FT020.mail.protection.outlook.com (10.152.98.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.3195.9 via Frontend Transport; Fri, 10 Jul 2020 19:22:07 +0000 Received: from P-EXBEND-EQX-01.jnpr.net (10.104.8.52) by P-EXFEND-EQX-02.jnpr.net (10.104.8.55) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 10 Jul 2020 12:21:20 -0700 Received: from p-mailhub01.juniper.net (10.104.20.6) by P-EXBEND-EQX-01.jnpr.net (10.104.8.52) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Fri, 10 Jul 2020 12:21:20 -0700 Received: from kaos.jnpr.net (kaos.jnpr.net [172.23.255.254]) by p-mailhub01.juniper.net (8.14.4/8.11.3) with ESMTP id 06AJLJ9t016458; Fri, 10 Jul 2020 12:21:19 -0700 (envelope-from sjg@juniper.net) Received: by kaos.jnpr.net (Postfix, from userid 1377) id 6EA966F7BF; Fri, 10 Jul 2020 12:21:19 -0700 (PDT) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 6E30D6F7BE; Fri, 10 Jul 2020 12:21:19 -0700 (PDT) To: "Rodney W. Grimes" CC: =?UTF-8?Q?Stefan_E=C3=9Fer?= , FreeBSD Hackers , Subject: Re: Huge mergeinfo list after merge from vendor branch In-Reply-To: <202007101640.06AGeloK096110@gndrsh.dnsmgr.net> References: <202007101640.06AGeloK096110@gndrsh.dnsmgr.net> Comments: In-reply-to: "Rodney W. Grimes" message dated "Fri, 10 Jul 2020 09:40:47 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.7.1; GNU Emacs 26.3 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <62460.1594408879.1@kaos.jnpr.net> Date: Fri, 10 Jul 2020 12:21:19 -0700 Message-ID: <64190.1594408879@kaos.jnpr.net> X-EXCLAIMER-MD-CONFIG: e3cb0ff2-54e7-4646-8a04-0dae4ac7b136 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:66.129.239.13; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:P-EXFEND-EQX-02.jnpr.net; PTR:InfoDomainNonexistent; CAT:NONE; SFTY:; SFS:(4636009)(376002)(39860400002)(346002)(396003)(136003)(46966005)(316002)(70206006)(54906003)(6266002)(107886003)(82310400002)(70586007)(356005)(83380400001)(2906002)(7696005)(47076004)(9686003)(86362001)(81166007)(478600001)(82740400003)(336012)(26005)(4326008)(55016002)(7126003)(5660300002)(6916009)(8936002)(186003)(4744005)(8676002)(14583001); DIR:OUT; SFP:1102; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cef07a17-204c-4070-11dc-08d82506897b X-MS-TrafficTypeDiagnostic: SN6PR05MB3949: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6BTmFt/k9f+l5F6rKHD4cf00Rwn0o5EGhDD3EbfOiXU3kQKwDtC8499RDOZ2QsMwSfzKTfN/hCd4mWAyG0//BxLH+ef3v1jqdH8GbIZKO/juE78Hcb7C8kh1j3HSdyf6BWJH3C8U/EsDPvZbiAAi7jswXbgQDNCOv6H7T+B7wFTa+YXXk/XmfHh0lVliXQpAZMZm87IPEWUBbaAPsQfNMQxgK+gALyzLJqp9Zv4K8hifMONEVLiasr42v18vN2NGebW+eMYmTLivD+Df81+uXlDJzO3W+sQuJBFm9Vm6iTagLhr5ghGOdGLQwXWBvraD2i1NNzijoudAq+1jkF6ccmrSciKvyqMATFu4uyPRwJaQoHJcpJ4ckMCoROapePEFPEXHiBEzZ5A/VVMxHnN76JZ5NpBrmuG2P/xe0vjLke4= X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2020 19:22:07.8421 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cef07a17-204c-4070-11dc-08d82506897b X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.13]; Helo=[P-EXFEND-EQX-02.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: DM3NAM05FT020.eop-nam05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR05MB3949 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-07-10_14:2020-07-10, 2020-07-10 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 lowpriorityscore=0 mlxlogscore=524 impostorscore=0 bulkscore=0 adultscore=0 priorityscore=1501 phishscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0 clxscore=1011 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2007100126 X-Rspamd-Queue-Id: 4B3Pzt0bZMz3ds3 X-Spamd-Bar: +++ X-Spamd-Result: default: False [3.58 / 15.00]; GREYLIST(0.00)[pass,body]; RECEIVED_SPAMHAUS_XBL(5.00)[66.129.239.13:received]; R_DKIM_ALLOW(0.00)[juniper.net:s=PPS1017,juniper.net:s=selector1]; NEURAL_HAM_MEDIUM(-0.59)[-0.590]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(0.00)[+ip4:67.231.152.164]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-0.31)[-0.311]; BAD_REP_POLICIES(0.10)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[juniper.net:+]; DMARC_POLICY_ALLOW(0.00)[juniper.net,reject]; NEURAL_HAM_SHORT(-0.42)[-0.416]; RCVD_IN_DNSWL_LOW(-0.10)[67.231.152.164:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:22843, ipnet:67.231.152.0/24, country:US]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_SEVEN(0.00)[10]; ARC_ALLOW(0.00)[microsoft.com:s=arcselector9901:i=1] X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jul 2020 20:39:55 -0000 Rodney W. Grimes wrote: > Was a merge done from the wrong working directory? > Merges need to be done while cwd is the top level of the src tree. Pretty sure the examples in the svn primer show cd contrib/foo svn merge ^/vendor/FOO/foo/dist . if that's not correct, and update would be useful.