89023c38fc
I made a mistake merge. Reverting it in c778945806b undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range: 4effe769e2b - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from 4effe769e2) - merging the last unaffected staging-next commit (803ca85c209) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state |
||
---|---|---|
.. | ||
4.8 | ||
4.9 | ||
6 | ||
7 | ||
8 | ||
9 | ||
10 | ||
common | ||
builder.sh | ||
gfortran-darwin-NXConstStr.patch | ||
gfortran-driving.patch | ||
gnat-cflags.patch | ||
libgomp-dont-force-initial-exec.patch | ||
libphobos.patch | ||
libstdc++-netbsd-ctypes.patch | ||
libstdc++-target.patch | ||
no-sys-dirs.patch | ||
parallel-bconfig.patch | ||
ppc-musl.patch | ||
res_state-not-declared.patch | ||
sigsegv-not-declared.patch | ||
struct-sigaltstack-4.9.patch | ||
struct-sigaltstack.patch | ||
struct-ucontext-4.5.patch | ||
struct-ucontext-4.8.patch | ||
struct-ucontext-libjava.patch | ||
struct-ucontext.patch | ||
use-source-date-epoch.patch |