From owner-freebsd-hackers@freebsd.org Fri Jul 10 23:50:37 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 441CA37712B for ; Fri, 10 Jul 2020 23:50:37 +0000 (UTC) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3VCv5l4rz46f0 for ; Fri, 10 Jul 2020 23:50:35 +0000 (UTC) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 06ANoWxH097420; Fri, 10 Jul 2020 16:50:32 -0700 (PDT) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: (from freebsd-rwg@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 06ANoWK5097419; Fri, 10 Jul 2020 16:50:32 -0700 (PDT) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <202007102350.06ANoWK5097419@gndrsh.dnsmgr.net> Subject: Re: Huge mergeinfo list after merge from vendor branch In-Reply-To: <92E891A1-0F43-458D-9B73-1011C81AFCBE@gmail.com> To: Enji Cooper Date: Fri, 10 Jul 2020 16:50:32 -0700 (PDT) CC: "Simon J. Gerraty" , "Rodney W. Grimes" , FreeBSD Hackers X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4B3VCv5l4rz46f0 X-Spamd-Bar: ++ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd-rwg@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd-rwg@gndrsh.dnsmgr.net X-Spamd-Result: default: False [2.15 / 15.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_SPAM_SHORT(0.08)[0.079]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.81)[0.812]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_SPAM_LONG(0.36)[0.360]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] 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:50:37 -0000 > > > On Jul 10, 2020, at 12:21 PM, Simon J. Gerraty via freebsd-hackers wrote: > > > > 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. > > Hi, > What sjg@ pointed out is the proper way to handle vendor updates/imports. > Thanks so much! I wonder if it is because of a svn copy that was done to originally create contrib/foo rather than an svn merge? -- Rod Grimes rgrimes@freebsd.org