Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C8B0ED11F for ; Fri, 1 Feb 2013 16:11:45 +0000 (UTC) Received: (qmail 62337 invoked by uid 500); 1 Feb 2013 16:11:45 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 61984 invoked by uid 500); 1 Feb 2013 16:11:40 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 61934 invoked by uid 99); 1 Feb 2013 16:11:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 16:11:38 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [192.203.228.196] (HELO elvis.mu.org) (192.203.228.196) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 16:11:28 +0000 Received: from Alfreds-MacBook-Pro-9.local (ool-45775fce.dyn.optonline.net [69.119.95.206]) by elvis.mu.org (Postfix) with ESMTPSA id CD4881A3DE8; Fri, 1 Feb 2013 08:11:05 -0800 (PST) Message-ID: <510BE919.8070406@mu.org> Date: Fri, 01 Feb 2013 11:11:05 -0500 From: Alfred Perlstein User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: users@subversion.apache.org, Stefan Sperling Subject: Re: FreeBSD project and subversion. References: <510A8FAA.2020903@mu.org> <20130131170819.GX13721@ted.stsp.name> In-Reply-To: <20130131170819.GX13721@ted.stsp.name> Content-Type: multipart/mixed; boundary="------------060106030403030102020305" X-Virus-Checked: Checked by ClamAV on apache.org This is a multi-part message in MIME format. --------------060106030403030102020305 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 1/31/13 12:08 PM, Stefan Sperling wrote: > On Thu, Jan 31, 2013 at 10:37:14AM -0500, Alfred Perlstein wrote: >> FreeBSD has moved to Subversion a few years ago and it's worked >> very, very well for us. > Thanks! That's encouraging to hear. > >> The one area where we are having issues is merging code from project >> branches back into trunk. >> >> The typical workflow is: >> 1) create project branch. >> 2) code code code. >> 3) sync from HEAD (this works great). >> 4) repeat steps 2+3 until feature is complete. >> 5) svn diff and apply to head then commit. >> >> Is there a way to do 5 automatically? >> >> I think the worry is mergeinfo from the project branch coming back >> into HEAD. >> >> Any tips would be appreciated. > I've read the FreeBSD svn merging docs some time ago. I'm not sure if > changes have been made since, but it was probably an older version > of what currently lives at this URL: > http://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html > > Back then I was somewhat worried that apparently the person who wrote them > didn't really understand much about how merges in Subversion work. > > There was irrational fear of mergeinfo propagation, to the point where > the recommended practice is to remove mergeinfo before commit, which > any Subversion user with a clue will know is very wrong (expect in very > exceptional circumstances and only if you are equipped with sufficient > expertise to deal with the consequences). > > What surprised me also was a complete lack of mention of the --reintegrate > option, which I suspect must be causing quite a lot of grief among FreeBSD > developers due to bogus conflicts during merges back into FreeBSD's head > branch (i.e. the trunk). > > We'll need more details to help you in a constructive way, though. > Can you provide more details about your steps 1 to 5, i.e. show the > exact commands you're running in each step? The repository is public, > after all, which will help greatly with identifying and reproducing > specific problems. > > I'm happy to provide input for improving FreeBSD's docs to the point > where FreeBSD makes the best possible use of Subversion 1.7's merge > implementation, and can also provide some hints as to how future versions > of Subversion will improve to make life easier in certain cases. > > BTW, I went over one of FreeBSD's svn wiki pages a while back, and added > answers to open questions on this page: > https://wiki.freebsd.org/SubversionMissing Thank you Stefan, So I have two answers here: 1) about mergeinfo It seems as if doing it all at the top can make merges over long haul internet very painful. 2) about reintegrate I've attached the two messages that show what makes FreeBSD gun shy about merges to HEAD. Maybe these issues are resolved, or maybe the developer did something incorrect, or maybe something else entirely different happened. See attached. Thank you, -Alfred --------------060106030403030102020305 Content-Type: message/rfc822; name="Attached Message" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="Attached Message" Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on elvis.mu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Original-To: bright@mu.org Delivered-To: bright@mu.org Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by elvis.mu.org (Postfix) with ESMTP id 4FC1B1A3DCD for ; Fri, 1 Feb 2013 06:54:32 -0800 (PST) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 44AEC11FA for ; Fri, 1 Feb 2013 14:54:32 +0000 (UTC) Received: by hub.freebsd.org (Postfix) id 433C23D1; Fri, 1 Feb 2013 14:54:32 +0000 (UTC) Delivered-To: alfred@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 41FDA3D0 for ; Fri, 1 Feb 2013 14:54:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id E5559AFF for ; Fri, 1 Feb 2013 14:54:31 +0000 (UTC) Received: from pakbsde14.localnet (unknown [38.105.238.108]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 54F0FB9BC for ; Fri, 1 Feb 2013 09:54:31 -0500 (EST) From: John Baldwin To: Alfred Perlstein Subject: Fwd: Re: SVN merge question. Date: Fri, 1 Feb 2013 09:49:23 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p22; KDE/4.5.5; amd64; ; ) MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_zX9CRbNRbX0geE6" Message-Id: <201302010949.23897.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 01 Feb 2013 09:54:31 -0500 (EST) --Boundary-00=_zX9CRbNRbX0geE6 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -- John Baldwin --Boundary-00=_zX9CRbNRbX0geE6 Content-Type: message/rfc822; name="forwarded message" Content-Transfer-Encoding: 7bit Content-Description: John Baldwin : Re: SVN merge question. Content-Disposition: inline Return-Path: Received: from bigwig.baldwin.cx ([unix socket]) by bigwig.baldwin.cx (Cyrus v2.3.16) with LMTPA; Fri, 01 Jun 2012 14:03:50 -0400 X-Sieve: CMU Sieve 2.3 Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by bigwig.baldwin.cx (Postfix) with ESMTP id D243EB94A for ; Fri, 1 Jun 2012 14:03:49 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id E7584B6791 for ; Fri, 1 Jun 2012 17:56:18 +0000 (UTC) Received: by hub.freebsd.org (Postfix) id 327CC1065698; Fri, 1 Jun 2012 17:56:16 +0000 (UTC) Delivered-To: jhb@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 538) id 63D71106566B; Fri, 1 Jun 2012 17:56:11 +0000 (UTC) Delivered-To: developers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1A1741065675; Fri, 1 Jun 2012 17:56:06 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id E42B28FC18; Fri, 1 Jun 2012 17:56:05 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 3F2FAB960; Fri, 1 Jun 2012 13:56:05 -0400 (EDT) From: John Baldwin To: obrien@freebsd.org Subject: Re: SVN merge question. Date: Fri, 1 Jun 2012 13:56:03 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p13; KDE/4.5.5; amd64; ; ) Cc: Grzegorz Bernacki , Eitan Adler , developers@freebsd.org References: <4FB3B779.8070006@freebsd.org> <201205161100.48208.jhb@freebsd.org> <20120601174029.GD9318@dragon.NUXI.org> In-Reply-To: <20120601174029.GD9318@dragon.NUXI.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201206011356.03933.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 01 Jun 2012 13:56:05 -0400 (EDT) Sender: owner-all-developers@FreeBSD.org Precedence: bulk X-Loop: FreeBSD.ORG X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 01 Jun 2012 14:03:49 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.97.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.9 required=4.2 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on bigwig.baldwin.cx X-Length: 4232 X-UID: 41129 On Friday, June 01, 2012 1:40:29 pm David O'Brien wrote: > On Wed, May 16, 2012 at 11:00:48AM -0400, John Baldwin wrote: > > I more or less don't trust svn merge to DTRT here. This was done with > > the cpuset branch merge up to HEAD and it broke the log history of many > > files in HEAD. > > Specifically how did it break log history? http://svnweb.freebsd.org/base/head/share/man/man4/geom_map.4?view=log You have to walk up to the previous directory in svnweb and go back to change 222812 and then click on geom_map.4 to find its original log. sys/dev/iicbus/ad7417.c was also busted this way. > > I would just generate a diff and manually apply that to > > a HEAD checkout and commit that. You could perhaps svn cp over new files > > from the nand branch to HEAD to preserve their history, but I worry that > > anything other than diff + patch for existing files risks hosing history. > > WOAH!! Please lets gain some new experience with 'svn merge' using > version 1.7. We do 100's of merges a year at $WORK (with svn 1.6) > on a code base 10x that of FreeBSD -- it works. I've never had problems with merging downstream into work branches. I've only seen upstream merges blow up. -- John Baldwin -- This mail is for the internal use of the FreeBSD project committers, and as such is private. This mail may not be published or forwarded outside the FreeBSD committers' group or disclosed to other unauthorised parties without the explicit permission of the author(s). --Boundary-00=_zX9CRbNRbX0geE6-- --------------060106030403030102020305 Content-Type: message/rfc822; name="Attached Message" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="Attached Message" Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on elvis.mu.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,SPF_SOFTFAIL autolearn=no version=3.3.2 X-Original-To: bright@mu.org Delivered-To: bright@mu.org Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) by elvis.mu.org (Postfix) with ESMTPS id A5D881A3DDB for ; Fri, 1 Feb 2013 06:54:38 -0800 (PST) Received: from pakbsde14.localnet (unknown [38.105.238.108]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 2B8C2B977; Fri, 1 Feb 2013 09:54:33 -0500 (EST) From: John Baldwin To: Alfred Perlstein Subject: Re: Fwd: Re: FreeBSD project and subversion. Date: Fri, 1 Feb 2013 09:50:37 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p22; KDE/4.5.5; amd64; ; ) Cc: Peter Wemm References: <20130131170819.GX13721@ted.stsp.name> <510BBAE5.5040807@mu.org> In-Reply-To: <510BBAE5.5040807@mu.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201302010950.37457.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 01 Feb 2013 09:54:33 -0500 (EST) On Friday, February 01, 2013 7:53:57 am Alfred Perlstein wrote: > John and Peter, both of you are +inf more knowledgeable about svn than I am. > > I see we still try to minimize svn mergeinfo from the FAQ ("Selecting > the Source and Target") > http://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers- guide/subversion-primer.html#AEN771 > > I know I've seen some emails explaining the reasoning behind this but I > can't find them. What would the effect of bringing mergeinfo to the top be? > > Possible problems: > 1) it would get very large > 2) if we ever were to split up the repo it would be a problem. > 3) ... ? It makes merges from across the continental US take a long time. > Additionally, what are our concerns about the --reintegrate option > (which was added (or at least improved) after we switched) It trashes history if SVN mucks it up (and it can). This has already happened at least once, and I've noted that in a thread on developers. I've forwarded you the relevant mail from that thread. -- John Baldwin --------------060106030403030102020305--