On Thu, 29 Apr 2021 06:53:18 -0700
Cy Schubert <cy.schub...@cschubert.com> wrote:
> In message <202104291234.13tcyk5k092...@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 <gre...@freebsd.org>
> > AuthorDate: 2021-04-29 12:29:04 +0000
> > Commit: Michael Gmelin <gre...@freebsd.org>
> > 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.
Can you show an example of how this fails for you (especially the error
messages)?
>
> 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?
Like in the mail thread linked in the git comment, theoretically a noop:
git clone https://g...@repo.freebsd.org/src.git
cd src
touch contrib/bc/*vcx*
git commit -a
git push
It's a problem caused by .gitattributes being checked in after the
*vcx* files were checked in (again, see the email thread and "man
1 gitattributes").
If it was for me, I would remove the .gitattributes eol specs, they
shouldn't be necessary for our purposes.
Best,
Michael
--
Michael Gmelin
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
