nixpkgs/pkgs/development/compilers/gcc
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 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: 4effe769e2
 - `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 (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
..
4.8 Merge remote-tracking branch 'origin/master' into gcc-cross 2020-08-26 16:10:02 -05:00
4.9 Merge remote-tracking branch 'origin/master' into gcc-cross 2020-08-26 16:10:02 -05:00
6 Merge remote-tracking branch 'origin/master' into gcc-cross 2020-08-26 16:10:02 -05:00
7 Merge remote-tracking branch 'origin/master' into gcc-cross 2020-08-26 16:10:02 -05:00
8 Merge remote-tracking branch 'origin/master' into gcc-cross 2020-08-26 16:10:02 -05:00
9 Merge pull request #94637 from antifuchs/gccemacs-on-darwin 2020-09-02 18:30:58 +02:00
10 gcc10: 10.1.0 -> 10.2.0 2020-09-12 11:54:39 +02:00
common gcc: Only use strip -x if building libgccjit on darwin 2020-08-29 23:10:38 -04:00
builder.sh Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
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