From owner-freebsd-hackers@freebsd.org Fri Jul 10 23:45:57 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 E256F3769E8 for ; Fri, 10 Jul 2020 23:45:57 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3V6X6FGpz46Qy for ; Fri, 10 Jul 2020 23:45:56 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pl1-x62d.google.com with SMTP id x11so2876619plo.7 for ; Fri, 10 Jul 2020 16:45:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=uF4yIm7szxRyvbAhUCtVerY1XOA7s8pLJHMLcbmN6RI=; b=cbI6FueGNsNVERspGw1Hyoe8FdoOe6syIw+D8BaUoxrA6JLIAzC0TCWJ7pPVPjlkNh hWm5VuxcUIB5RHv+xZYLST3TGE+iMmINLLWo2rXWbsMOfRzf+wp+4xHXWcO7xcydEMKP NTXiBGEyuSnzUjntcqrNb1I1i2U3pMKQ/hURmYgEHgwV8C1uQcgyiEoD+uwtlV7h165I A2/lhFjm2TR5dZgb4Cc2DXZxuOgFNp0iSl/ijDsTQZo7uUOV1yVQU07L/7UXHB+3Urn0 1pkH+/Bp+H/g1LAM4hr2tVsrzJNlMoztMqxJ6PE3kuOVLuubJX+h3zuKrQ2XnzVV6GU8 HN5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=uF4yIm7szxRyvbAhUCtVerY1XOA7s8pLJHMLcbmN6RI=; b=J54jJ1x7RD02rTPB023xCAqu3aTkKbhFIYLta+ioSpkw3uNKp67FKkICUyUIRNGuoo nx4pUqXObdGdJpHt7azFGrHpKwdZrPtFNF/0xR2FYmj5lzuP8eu7/pVulQk2rqf18FdM PoQD/uirgs11nnQ4rtm6HNjXuPzsjnmzKXz3D5OOcvCT7e/wj8tM7AQc5/qRX5jE1cjg ihe7fFrR1ewiJsVomnN+8vq87Ts2x0NhBf1oqF7b9/6RlB9p04RHd/H30jWmZZHxhqpH V25gmOWy+dzJ1m3FRrtom3NwmirZ29fwLe/vS+Psjp+BVq/6X934nVCXosolDdVhpRy2 031g== X-Gm-Message-State: AOAM531S3RY/wJjTXBo4TZRLSKpzJ+m/Lxh2dQtzOrR4pvQKC4kgb29k BDY/WPK931Pbw/kiCBKv+NdngUhcRmI= X-Google-Smtp-Source: ABdhPJybvKHUn2ryRVh7STSKig0si5O6x3k+nFTfmdtqB0JpaO2yxeMak/b5knD1sZNspeKdf/NHBw== X-Received: by 2002:a17:90a:324c:: with SMTP id k70mr8645469pjb.18.1594424755234; Fri, 10 Jul 2020 16:45:55 -0700 (PDT) Received: from [192.168.20.26] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id f18sm6466792pgv.84.2020.07.10.16.45.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jul 2020 16:45:54 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Re: Huge mergeinfo list after merge from vendor branch From: Enji Cooper In-Reply-To: <64190.1594408879@kaos.jnpr.net> Date: Fri, 10 Jul 2020 16:45:54 -0700 Cc: "Rodney W. Grimes" , FreeBSD Hackers Content-Transfer-Encoding: quoted-printable Message-Id: <92E891A1-0F43-458D-9B73-1011C81AFCBE@gmail.com> References: <202007101640.06AGeloK096110@gndrsh.dnsmgr.net> <64190.1594408879@kaos.jnpr.net> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.3608.80.23.2.2) X-Rspamd-Queue-Id: 4B3V6X6FGpz46Qy X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=cbI6FueG; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::62d as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com X-Spamd-Result: default: False [-3.25 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.78)[-0.779]; RECEIVED_SPAMHAUS_PBL(0.00)[73.19.52.228:received]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.97)[-0.966]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.01)[-1.009]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-hackers@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::62d:from]; RCVD_TLS_ALL(0.00)[] 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 23:45:57 -0000 > On Jul 10, 2020, at 12:21 PM, Simon J. Gerraty via freebsd-hackers = wrote: >=20 > 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. >=20 > Pretty sure the examples in the svn primer show >=20 > cd contrib/foo > svn merge ^/vendor/FOO/foo/dist . >=20 > if that's not correct, and update would be useful. Hi, What sjg@ pointed out is the proper way to handle vendor = updates/imports. Thanks so much! -Enji=