Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 16d12f82d725
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e03f5f9c60c4
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on May 21, 2021

  1. Add to project.

    pleroy committed May 21, 2021
    Copy the full SHA
    6914e3b View commit details

Commits on May 22, 2021

  1. Copy the full SHA
    8715199 View commit details
  2. Merge pull request #2992 from pleroy/Ketchup

    Improved catching-up documentation
    pleroy authored May 22, 2021
    Copy the full SHA
    e03f5f9 View commit details
Showing with 26 additions and 2 deletions.
  1. +1 −0 Principia.sln
  2. +25 −2 documentation/Catching Up.md
1 change: 1 addition & 0 deletions Principia.sln
Original file line number Diff line number Diff line change
@@ -142,6 +142,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentat
documentation\basestyle.cls = documentation\basestyle.cls
documentation\bibliography.bib = documentation\bibliography.bib
documentation\bibliography.tex = documentation\bibliography.tex
documentation\Catching Up.md = documentation\Catching Up.md
documentation\Celledoni.tex = documentation\Celledoni.tex
documentation\Composition methods.tex = documentation\Composition methods.tex
documentation\Fukushima.tex = documentation\Fukushima.tex
27 changes: 25 additions & 2 deletions documentation/Catching Up.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Instructions for catching-up dependents
# Instructions for catching up dependencies

- [ ] Create a tag for the current master.
- [ ] Create a new branch for the catch-up:
```powershell
git checkout master
git tag master20210521
```
- [ ] Create a new branch for the catch-up:
```powershell
git checkout master
git checkout -b Ketchup
@@ -10,6 +14,7 @@
one on which we applied our changes):
```powershell
git checkout master
git log --oneline
git reset --hard <commit>
```
- [ ] Pull the changes made to google/master:
@@ -31,3 +36,21 @@
```powershell
git branch -d Ketchup
```

## Notes

In `absl` some of the tests related to the arithmetic of `Duration` fail in mysterious ways:

* `Time.FloorConversion`
* `Time.RoundtripConversion`
* `Time.ToChronoTime`
* `SleepFor.Bounded`
* `Duration.FactoryOverloads`
* `Duration.Range`
* `Duration.AbsoluteValue`
* `Duration.FormatDuration`
* `Duration.ParseDuration`

We should avoid `operator/` and `operator*` on `Duration`.

In `absl` the test `NotificationTest.SanityTest` is flaky (or slop-y).