Date: Thu, 29 Apr 2021 15:14:39 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Michael Gmelin <grembo@FreeBSD.org>, "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@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. Message-ID: <4A4F69FA-347D-4EA2-8F6C-E5CFEF054715@freebsd.org> In-Reply-To: <202104291353.13TDrIg3026309@slippy.cwsent.com> References: <202104291234.13TCYk5K092776@gitrepo.freebsd.org> <202104291353.13TDrIg3026309@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 29 Apr 2021, at 14:53, Cy Schubert <Cy.Schubert@cschubert.com> 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 <grembo@FreeBSD.org> >> AuthorDate: 2021-04-29 12:29:04 +0000 >> Commit: Michael Gmelin <grembo@FreeBSD.org> >> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A4F69FA-347D-4EA2-8F6C-E5CFEF054715>