From owner-dev-commits-src-all@freebsd.org Thu Apr 29 21:28:34 2021 Return-Path: Delivered-To: dev-commits-src-all@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 49129636D6E; Thu, 29 Apr 2021 21:28:34 +0000 (UTC) (envelope-from grembo@freebsd.org) Received: from mail.evolve.de (mail.evolve.de [213.239.217.29]) (using TLSv1.3 with cipher TLS_CHACHA20_POLY1305_SHA256 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail.evolve.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FWTBn3yD9z3Hq7; Thu, 29 Apr 2021 21:28:32 +0000 (UTC) (envelope-from grembo@freebsd.org) Received: by mail.evolve.de (OpenSMTPD) with ESMTP id ae6e61b1; Thu, 29 Apr 2021 21:28:30 +0000 (UTC) Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id ecdb0dff (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Thu, 29 Apr 2021 21:28:29 +0000 (UTC) Date: Thu, 29 Apr 2021 23:28:09 +0200 From: Michael Gmelin To: Cy Schubert Cc: Michael Gmelin , 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. Message-ID: <20210429232809.7c78e25b@bsd64.grem.de> In-Reply-To: <202104292020.13TKK6a4010861@slippy.cwsent.com> References: <202104291234.13TCYk5K092776@gitrepo.freebsd.org> <202104291353.13TDrIg3026309@slippy.cwsent.com> <20210429162959.16662d66@bsd64.grem.de> <202104291455.13TEtxEg040285@slippy.cwsent.com> <20210429172122.1751663f@bsd64.grem.de> <202104291730.13THUOv6006096@slippy.cwsent.com> <20210429200740.5e8bfe5a@bsd64.grem.de> <202104292020.13TKK6a4010861@slippy.cwsent.com> X-Face: $wrgCtfdVw_H9WAY?S&9+/F"!41z'L$uo*WzT8miX?kZ~W~Lr5W7v?j0Sde\mwB&/ypo^}> +a'4xMc^^KroE~+v^&^#[B">soBo1y6(TW6#UZiC]o>C6`ej+i Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWJBwe5BQDl LASZU0/LTEWEfHbyj0Txi32+sKrp1Mv944X8/fm1rS+cAAAACXBIWXMAAAsTAAAL EwEAmpwYAAAAB3RJTUUH3wESCxwC7OBhbgAAACFpVFh0Q29tbWVudAAAAAAAQ3Jl YXRlZCB3aXRoIFRoZSBHSU1QbbCXAAAAAghJREFUOMu11DFvEzEUAGCfEhBVFzuq AKkLd0O6VrIQsLXVSZXoWE5N1K3DobBBA9fQpRWc8OkWouaIjedWKiyREOKs+3PY fvalCNjgLVHeF7/3bMtBzV8C/VsQ8tecEgCcDgrzjekwKZ7TwsJZd/ywEKwwP+ZM 8P3drTsAwWn2mpWuDDuYiK1bFs6De0KUUFw0tWxm+D4AIhuuvZqtyWYeO7jQ4Aea 7jUqI+ixhQoHex4WshEvSXdood7stlv4oSuFOC4tqGcr0NjEqXgV4mMJO38nld4+ xKNxRDon7khyKVqY7YR4d+Cg0OMrkWXZOM7YDkEfKiilCn1qYv4mighZiynuHHOA Wq9QJq+BIES7lMFUtcikMnkDGHUoncA+uHgrP0ctIEqfwLHzeSo+eUA66AqzwN6n 2ZHJhw6Qh/PoyC/QENyEyC/AyNjq74Bs+3UH0xYwzDUC4B97HgLocg1QLYgDDO1v f3UX9Y307Ew4AHh67YAFFsxEpkXwpXY3eIgMhAAE3R19L919nNnuD2wlPcDE3UeT L2ytEICQib9BXgS2fU8PrD82ToYO1OEmMSnYTjSqSv9wdC0tPYC+rQRQD9ESnldF CyqfmiYW+tlALt8gH2xrMdC/youbjzPXEun+/ReXsMCDyve3dZc09fn2Oas8oXGc Jj6/fOeK5UmSMPmf/jL+GD8BEj0k/Fn6IO4AAAAASUVORK5CYII= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FWTBn3yD9z3Hq7 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:24940, ipnet:213.239.192.0/18, country:DE] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2021 21:28:34 -0000 On Thu, 29 Apr 2021 13:20:06 -0700 Cy Schubert wrote: > In message <20210429200740.5e8bfe5a@bsd64.grem.de>, Michael Gmelin > writes: > ... > > also easily demonstrate the problem by doing: > > > > cp -a /usr/src /usr/srccopy > > cd /usr/src/srccopy > > git status > > No luck with this. > > > > > Or by doing: > > > > cd /usr/src > > rm .git/index > > git reset > > git status > > No luck with this either: > > > ... > > > > or by doing: > > > > cd /usr/src > > touch contrib/bc/*vcx* > > git status > > Same slippy$ touch contrib/bc/*vcx* > You have new mail. You might have misread my email. The point of these various tests was to demonstrate how the problem came into the tree and why I committed the changed files today. Hence "demonstrate the problem", not "demonstrate the solution to the problem". > Next I tried committing the following to the branch: > > slippy$ git br > * komquats > main > slippy$ git ci contrib/bc/bc.vcxproj contrib/bc/bc.vcxproj.filters > contrib/bc/bcl.vcxproj contrib/bc/bcl.vcxproj.filters > ... > Switched to branch 'main' > Your branch is up to date with 'freebsd/main'. > ... > slippy$ git co komquats > error: Your local changes to the following files would be overwritten > by checkout: > contrib/bc/bc.vcxproj > contrib/bc/bc.vcxproj.filters > contrib/bc/bcl.vcxproj > contrib/bc/bcl.vcxproj.filters > Please commit your changes or stash them before you switch branches. > Aborting If this was on "main" from today (a0358e3d51849 or later), this shouldn't happen (just tested it myself). If it was main from your ZFS snapshot from a few days ago, then I would expect to see this result. > ... > > > > 1. Simply add the files that are shown as changed on your local > > branch (that's all my commit did, "git commit -a"). > > 2. Temporarily do: > > echo "contrib/bc/bc*.vcx* -text" >>.git/info/attributes > > Neither of those worked for me. Again this is purely academic now but > looking to understand this should it happen again, with committed > work. I tested 2. again locally and it works for me. > > I've saved the entire zfs filesystem tree in a zfs-send stream for > more experimentation later. Hopefully my notes above are of some > value to someone. > Any chance you could share that ZFS stream with me? I would like to reproduce your results. Best Michael -- Michael Gmelin