From owner-freebsd-hackers@freebsd.org Fri Jul 10 16:40: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 4DF2036D874 for ; Fri, 10 Jul 2020 16:40:55 +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 4B3Jh66FSqz4pm6; Fri, 10 Jul 2020 16:40:54 +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 06AGel3o096111; Fri, 10 Jul 2020 09:40:47 -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 06AGeloK096110; Fri, 10 Jul 2020 09:40:47 -0700 (PDT) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <202007101640.06AGeloK096110@gndrsh.dnsmgr.net> Subject: Re: Huge mergeinfo list after merge from vendor branch In-Reply-To: <5de31051-6f12-5353-43a1-0456579aaa67@freebsd.org> To: =?UTF-8?Q?Stefan_E=C3=9Fer?= Date: Fri, 10 Jul 2020 09:40:47 -0700 (PDT) CC: 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: 4B3Jh66FSqz4pm6 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] 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 16:40:55 -0000 > We have gathered lots of mergeinfo junk in the source tree over the > decades, but I did not know it was so bad ... > > > I had not performed any merges for a long time and now that I have > to merge from the vendor branch to contrib in -CURRENT, I'm surprised > by the long mergeinfo list I got: > > $ svn propget svn:mergeinfo -R /usr/src/contrib/bc > . - /projects/bectl/contrib/bc:336666-337662 > /projects/bsd_rdma_4_9/contrib/bc:319973-326168 > /projects/bsnmp-improved-ipv6-support/contrib/bc:301868 > /projects/building-blocks/contrib/bc:275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673 > /projects/clang-sparc64/contrib/bc:262258-262612 > /projects/clang-trunk/contrib/bc:283596-287505 > [...] > /vendor/bc/dist:362987-363077 > /vendor/device-tree/dist/contrib/bc:303380 > /vendor/resolver/dist/contrib/bc:1540-186085 > > A total of 56 lines, which are not relevant to this software, except for > the 3rd last line: > > /vendor/bc/dist:362987-363077 > > Before causing a mess in the repo by committing the merged sources, > I'd like to know whether this is "normal" behavior, or whether I need > to clean up the mergeinfo before the commit. > > Thanks in advance, STefan > > PS: The committers handbook has quite some information regarding this > kind of merge, but it makes me think that only the relevant mergeinfo > line should have been registered ... Was a merge done from the wrong working directory? Merges need to be done while cwd is the top level of the src tree. If done in a subdirectory a massive pile of unwanted mergeinfo is created. You can step back through the merge commits and see when this happened. -- Rod Grimes rgrimes@freebsd.org