Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0

2023-08-16 Thread Ed Maste
On Wed, 9 Aug 2023 at 22:32, Enji Cooper wrote: > > The branch main has been updated by ngie: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=28f6c2f292806bf31230a959bc4b19d7081669a7 > > commit 28f6c2f292806bf31230a959bc4b19d7081669a7 > Author: Enji Cooper > AuthorDate: 2023-08-08 06:17:3

Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0

2023-08-15 Thread Enji Cooper
> On Aug 15, 2023, at 12:15 PM, Jessica Clarke wrote: … > What’s this thing? Sounds like you did some merging, squashing and > rebasing, didn’t fix up the commit message and didn’t notice that git > rebase eats merges? See [1] for how to do this properly. Ugh. That process looks incred

Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0

2023-08-15 Thread Jessica Clarke
On 10 Aug 2023, at 03:32, Enji Cooper wrote: > > The branch main has been updated by ngie: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=28f6c2f292806bf31230a959bc4b19d7081669a7 > > commit 28f6c2f292806bf31230a959bc4b19d7081669a7 > Author: Enji Cooper > AuthorDate: 2023-08-08 06:17:3

Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0

2023-08-13 Thread Dag-Erling Smørgrav
Enji Cooper writes: > commit 28f6c2f292806bf31230a959bc4b19d7081669a7 > Author: Enji Cooper > AuthorDate: 2023-08-08 06:17:32 + > Commit: Enji Cooper > CommitDate: 2023-08-10 09:32:33 + > > Import GoogleTest 1.14.0 I haven't been able to build world since this went in. ===>

git: 28f6c2f29280 - main - Import GoogleTest 1.14.0

2023-08-09 Thread Enji Cooper
The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=28f6c2f292806bf31230a959bc4b19d7081669a7 commit 28f6c2f292806bf31230a959bc4b19d7081669a7 Author: Enji Cooper AuthorDate: 2023-08-08 06:17:32 + Commit: Enji Cooper CommitDate: 2023-08-10 09:32:33