From owner-dev-commits-src-main@freebsd.org Thu Apr 29 14:14:44 2021 Return-Path: Delivered-To: dev-commits-src-main@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 23CF8629ACB for ; Thu, 29 Apr 2021 14:14:44 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 4FWHZC0Hcpz4hTS for ; Thu, 29 Apr 2021 14:14:43 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f49.google.com with SMTP id l189-20020a1cbbc60000b0290140319ad207so9025349wmf.2 for ; Thu, 29 Apr 2021 07:14:42 -0700 (PDT) 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=JSWw5nQiOY6TRZoz9cJT6ZuWgb6vW3Ce01tl6I4VzX0=; b=CsgoatNH7iEBnEitTAJSBMflyoMuxtJSAxYS6oXZhCBOUtNAUay7Sy9hHLc4a2G4E6 bLWvMiX/8Vtz1xnMxD0XcKD2XHi1RZazbsh9Sdxq7+HhgRwR9P5jDvtxvagVODoK+J7r qLqQmY5xjBt6bTYRvrtLMxqJt+UJiKnDt3bhzLJf1rizKjkvOk3m1RceBWonmUBABakI 0XYEhpau8w4jacC8RBu4mFP9vDZeeJTEGQEY3/HVuguoSl0A3e6TImVFeCkM5+/UP9mU zl7pnmpGLWdJqKwxLGiiX+1zztR8nPWWSLtfFwb4WwhPTLmKGUUMF3N5Kjmb9iOWhWDb VqBg== X-Gm-Message-State: AOAM533zIEwts3pydqQpz9pcSg7pKRgqw2Ga4S3lHiST4aag6+l4ztyB UmAUiSo/o7GetFopcrYkVsPDoA== X-Google-Smtp-Source: ABdhPJzqQMy3AmXxcv2fy08Iugd1arImVeISV0AZP52bvVyJNZoCh5AuIWlMERInTlhYLpdPA3fQ3Q== X-Received: by 2002:a05:600c:293:: with SMTP id 19mr227657wmk.144.1619705680377; Thu, 29 Apr 2021 07:14:40 -0700 (PDT) Received: from [192.168.150.72] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id c2sm113859wmr.22.2021.04.29.07.14.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Apr 2021 07:14:40 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: git: a0358e3d5184 - main - Synch index of contrib/bc with what is in workdir after cloning. From: Jessica Clarke In-Reply-To: <202104291353.13TDrIg3026309@slippy.cwsent.com> Date: Thu, 29 Apr 2021 15:14:39 +0100 Cc: Michael Gmelin , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <4A4F69FA-347D-4EA2-8F6C-E5CFEF054715@freebsd.org> References: <202104291234.13TCYk5K092776@gitrepo.freebsd.org> <202104291353.13TDrIg3026309@slippy.cwsent.com> To: Cy Schubert X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4FWHZC0Hcpz4hTS X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.50 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MV_CASE(0.50)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.128.49:from]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.128.49:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.49:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.49:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-main] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2021 14:14:44 -0000 On 29 Apr 2021, at 14:53, Cy Schubert wrote: >=20 > In message <202104291234.13TCYk5K092776@gitrepo.freebsd.org>, Michael=20= > Gmelin wr > ites: >> The branch main has been updated by grembo (ports committer): >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da0358e3d5184950b4316f105eb292cba= >> fdea208b >>=20 >> commit a0358e3d5184950b4316f105eb292cbafdea208b >> Author: Michael Gmelin >> AuthorDate: 2021-04-29 12:29:04 +0000 >> Commit: Michael Gmelin >> CommitDate: 2021-04-29 12:33:56 +0000 >>=20 >> Synch index of contrib/bc with what is in workdir after cloning. >>=20 >> =46rom a workdir perspective this should be a no-op. >> See also: >> = https://lists.freebsd.org/pipermail/freebsd-current/2021-April/079569.htm >> l >> --- >> contrib/bc/bc.vcxproj | 554 = ++++++++++++++++++++------------------- >> -- >> contrib/bc/bc.vcxproj.filters | 362 +++++++++++++-------------- >> contrib/bc/bcl.vcxproj | 320 ++++++++++++------------ >> contrib/bc/bcl.vcxproj.filters | 190 +++++++------- >> 4 files changed, 713 insertions(+), 713 deletions(-) >>=20 >=20 > Whatever was done here I cannot rebase from main to my local branches. = The=20 > files remain modified. The only recourse so far was to delete the = local=20 > branch and start over. I've done this to one inconsequential branch so = far=20 > but hopefully someone can suggest a solution. >=20 > git restore the files, git rm the files, rm the files, git stash push, = all=20 > don't remove them from the branch following rebase. And subsequent = rebase=20 > to main will fail. main is ok though. >=20 > What is it that you did to sync the index? Given it=E2=80=99s a vcxproj, is this a CRLF vs LF issue? Also, why do we even have these files? Can we not just delete them from = the repo? Big blogs of Visual Studio-generated XML are entirely useless. Jess