From owner-svn-src-stable-11@freebsd.org Fri Mar 16 23:34:46 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCF82F56C90 for ; Fri, 16 Mar 2018 23:34:45 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yw0-x233.google.com (mail-yw0-x233.google.com [IPv6:2607:f8b0:4002:c05::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 00D2D7A509 for ; Fri, 16 Mar 2018 23:34:44 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yw0-x233.google.com with SMTP id r145so5238526ywe.7 for ; Fri, 16 Mar 2018 16:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=N/xFMSRkY7StWcNKBv/8LYsrqkEU6kdqkLvZDosoN1U=; b=dmMl2e1SUzo2YgQIBQEcN0G/h7R0tSLrasHjCaz3AM82/IAObpsQsKZ9Fe1d++0sHN SUyv1aYzP3nM3yKuiwZafsF88XqXFekloi59fBOjPNRmrNPQrvjUMAHLJLvWmksKV9BD TbzeuCGjbZ8OjVvvDfcaSEpoy5sAzd6aLtaFOVIHG701CMiaUZ6j/SRwJ2ak3eAwioqJ LWQPMk5bCQHnmOIQlQTvrYG9CVz0Q7vhx45IEywDX6bmDNazlGUdTrMU83kDClgpvYIe fqwHvAdTTHIs9yYHTjetOKU9ebCxemUE8mKm13Dr1D+2dOYsSj0kRoEMMpj+pTIM6OF8 WaiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=N/xFMSRkY7StWcNKBv/8LYsrqkEU6kdqkLvZDosoN1U=; b=TS7axT+ojNsIk08MncLdA2TCoKHRBrvFzWqpSu+yuQ5hYMiGJWQRf/P4k3rsg6a8oM +6XdY9NlR1OUVz85nXJnuEtHurrYVoMqhxwom5yitAlJCZ8MywKkv5Jn9HdZSf+unomI zQkDkatFdZeGGCepobTz7rpOa9Xzsv9rJrAUOMJT4+858hh9ANgtZo3NYFdLKnJ0vF17 J3FPFRd19MzoZNKEBNcoyIiMv7ObycW3U4IN7agMqm16JHNm3ri2dh0XzcUkx+xHh7Dl n+9x4MKelLWgC7MLZWIfwHwA5DIlfMuvFGoSsJtxlJc3ihGyt0BxPl0QfahrbFnlWafv m10g== X-Gm-Message-State: AElRT7Gd5LK+RQohED5BDB8wZ6KL5e/DyBRVJdZ+IgXIcDSkkd8r24NH 9jA1u/rCcdkJBXIORzFDMIU/D1A4Unt4n4Izx+V/nA== X-Google-Smtp-Source: AG47ELsHls/LbWx8ib3PRqz1qUHWC9QbofG/n/46X/N663DbNeqgy+FPPkav/JQ/n+ZJewhUMMDYQtUnIAveouCUH8g= X-Received: by 2002:a25:cb8b:: with SMTP id b133-v6mr2458390ybg.29.1521243284251; Fri, 16 Mar 2018 16:34:44 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:3492:0:0:0:0:0 with HTTP; Fri, 16 Mar 2018 16:34:43 -0700 (PDT) In-Reply-To: <201803161433.w2GEXsbP098131@pdx.rh.CN85.dnsmgr.net> References: <20180316181800.B904@besplex.bde.org> <201803161433.w2GEXsbP098131@pdx.rh.CN85.dnsmgr.net> From: Oliver Pinter Date: Sat, 17 Mar 2018 00:34:43 +0100 Message-ID: Subject: Re: svn commit: r330972 - stable/11/share/misc To: rgrimes@freebsd.org Cc: Bruce Evans , src-committers@freebsd.org, Eitan Adler , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-11@freebsd.org, Andriy Gapon Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 23:34:46 -0000 On 3/16/18, Rodney W. Grimes wrote: >> On Thu, 15 Mar 2018, Rodney W. Grimes wrote: >> >> >> On 15/03/2018 10:30, Eitan Adler wrote: >> >>> ... >> >>> Log: >> >>> MFC >> >>> r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: >> >> I have never seen things like these MFC-ed before... >> >> Should we be really doing them? >> > >> > Yes, imho. And the reasons may seem odd to sum, but here is my spin on >> > this: >> > ... >> > Maybe we should even add to the end of the commiters "these are the >> > things you should do as a new committer" the merging of your info >> > into to all supported/active releases. Which is a good opportunity >> > for teaching how to do svn sparse checkouts as you really do not >> > want to pull all of stable/10 out just to commit to 1 file. >> >> Actually, it is necessary to check out everything to MFC to 1 file. >> Sparse checkouts only work for committing to head. They break mergeinfo >> for MFCs. Or so I was told when I MFCed with a sparse checkout. This is >> my excuse for not MFC'ing anything. > > The procedure for a branch is harder, you can do sparse, you just > have to do the tree one level at a time in sparse mode until you > get to the leaf you want to commit at. > > Then you do the merge at the top of the sparse tree, > then commit: > > (Recent example done to help someone with there first MFC:) > > #!/bin/sh > mkdir ~/svnwork.r328011 > cd ~/svnwork.r328011 > svn checkout svn+ssh://repo.freebsd.org/base --depth immediates > > cd base/stable && svn update --set-depth=immediates > cd 11 && svn update --set-depth=immediates > cd sys && svn update --set-depth=immediates > cd amd64 && svn update --set-depth=infinity > > cd ~/svnwork.r328011/base/stable/11 > svn merge -c r328011,r329162 ^/head > svn diff >~/svnwork.r328011/diff.OUT > > > You now no longer have that excuse :-) wow, this looks like a brutal overhead... :-\ If I want to pull up a specific file to a specific version with git, I have two options: a) a proper way a.0) git checkout target_branch a.1) git log origin_branch -- path/file a.2) collect the commit ids from the above command a.3) foreach i ( collected ids ) git cherry-pick $i b) the lazy mode b.0) git checkout target_branch b.1) git show target_branch:./path/file > ./path/file b.2) git commit -a the b.1) point will be a git show id:./path/file > ./path/file too, where the id is an exact git commit id > > -- > Rod Grimes > rgrimes@freebsd.org > _______________________________________________ > svn-src-stable-11@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11 > To unsubscribe, send any mail to > "svn-src-stable-11-unsubscribe@freebsd.org" >