From owner-dev-commits-src-main@freebsd.org Thu Apr 29 13:53:24 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 5121C6290D4; Thu, 29 Apr 2021 13:53:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FWH5b6V9Pz4gQv; Thu, 29 Apr 2021 13:53:23 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.66.148.124]) by shaw.ca with ESMTPA id c76UltAepycp5c76WlpIrj; Thu, 29 Apr 2021 07:53:20 -0600 X-Authority-Analysis: v=2.4 cv=H864f8Ui c=1 sm=1 tr=0 ts=608aba50 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=8nJEP1OIZ-IA:10 a=3YhXtTcJ-WEA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=yWh5RUOQ12QQ51R3MFcA:9 a=wPNLvfGTeEIA:10 a=7CMUNi_NFEAA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 18E3822D5; Thu, 29 Apr 2021 06:53:18 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 13TDrIg3026309; Thu, 29 Apr 2021 06:53:18 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202104291353.13TDrIg3026309@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Michael Gmelin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: a0358e3d5184 - main - Synch index of contrib/bc with what is in workdir after cloning. In-reply-to: <202104291234.13TCYk5K092776@gitrepo.freebsd.org> References: <202104291234.13TCYk5K092776@gitrepo.freebsd.org> Comments: In-reply-to Michael Gmelin message dated "Thu, 29 Apr 2021 12:34:46 +0000." Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Date: Thu, 29 Apr 2021 06:53:18 -0700 X-CMAE-Envelope: MS4xfICSd8XUQrXzi7CpRwnn23VhS27gdKcZn4wC7pGotFrZSx1H8C41QKG6seI3MCp7VFOiEga46eBBg4hjJ7YfjXHk9l8VAn6/myn0nryC/cvvyoU4v2t+ KIJ3kInBO1r/qGeTh8SBRq0VWd29VwzwewOEJgbvDjEpvZxwCcDMTGGhAvim8aZWYNf8aREC7AnM/xMIYP/ocE6oUWvXaT7GyPVAQ2bPVx2+2WjxVt0tlKdy XLuigtiRTc9pNJSp/yCdDkdj4Gb0m8v6ohulsq92HjL5nu9z+mZzoDbnXDpdXQCVJLy172WeJHiV6fvXg5e1ONv2wuNUurWnVUvGu6HU7cM= X-Rspamd-Queue-Id: 4FWH5b6V9Pz4gQv X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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 13:53:24 -0000 In message <202104291234.13TCYk5K092776@gitrepo.freebsd.org>, Michael Gmelin wr ites: > The branch main has been updated by grembo (ports committer): > > URL: https://cgit.FreeBSD.org/src/commit/?id=a0358e3d5184950b4316f105eb292cba > fdea208b > > commit a0358e3d5184950b4316f105eb292cbafdea208b > Author: Michael Gmelin > AuthorDate: 2021-04-29 12:29:04 +0000 > Commit: Michael Gmelin > CommitDate: 2021-04-29 12:33:56 +0000 > > Synch index of contrib/bc with what is in workdir after cloning. > > From 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(-) > Whatever was done here I cannot rebase from main to my local branches. The files remain modified. The only recourse so far was to delete the local branch and start over. I've done this to one inconsequential branch so far but hopefully someone can suggest a solution. git restore the files, git rm the files, rm the files, git stash push, all don't remove them from the branch following rebase. And subsequent rebase to main will fail. main is ok though. What is it that you did to sync the index? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few.