search

ioccc-src / temp-test-ioccc

Temporary test IOCCC web site that will go away
Creative Commons Attribution Share Alike 4.0 International
28 stars 6 forks source link

Change 'may not compile to 'might not compile' #38

Closed xexyl closed 1 year ago

xexyl commented 1 year ago 
This is a subtle thing that I brought up on GitHub. Landon made the
change in many files but missed some in 1986 through 1989. I am aware of
a mass typo in the Makefiles but since some Makefiles are pending
changes I'm not doing that yet.
xexyl commented 1 year ago

Doing other things now.

Good day!

lcn2 commented 1 year ago

Thank you for this pull request #38.

We noticed, @xexyl, something odd about the set of pull request from #33 thru #38.

Each pull request after #33 contained the all of the pull request changes back to #33. So for example, pull request #34 included add of the file modifications from pull request #33.

If you look at the pull requites files for #34, they contain the newly modified 1993/Makefile as well as ALL of the files modified by #33.

The the pull requites files for #35 added some more files and included all of pull requites files for #34 which in turn had LL of the files modified by #33.

And so on thru pull requites files for #38 . They all merged OK, so everything worked out. We just wanted you to know that something odd is happening with compounding pull requests in terms of files modified.

xexyl commented 1 year ago

Thank you for this pull request #38.

We noticed, @xexyl, something odd about the set of pull request from #33 thru #38.

Each pull request after #33 contained the all of the pull request changes back to #33. So for example, pull request #34 included add of the file modifications from pull request #33.

If you look at the pull requites files for #34, they contain the newly modified 1993/Makefile as well as ALL of the files modified by #33.

The the pull requites files for #35 added some more files and included all of pull requites files for #34 which in turn had LL of the files modified by #33.

And so on thru pull requites files for #38 . They all merged OK, so everything worked out. We just wanted you to know that something odd is happening with compounding pull requests in terms of files modified.

Hmm. I have a theory of what happened but I have to look at it on my laptop. If so I might have to delete my fork and refork it. If so I have a concern that I won’t be able to fork the right repo again. I will try and figure it out. I actually am about to boot the laptop up (well first get it out).

Thank you for pointing this out!

xexyl commented 1 year ago

Oh and you are very welcome my good friend!

xexyl commented 1 year ago

As far as my theory goes. I think it might be because I had tried at one point to use branch updates but it already existed here on github. I couldn’t push changes. So I had to create a new branch and then push THAT branch.

I maybe should have deleted the branch here on github first. If I am thinking right I know exactly what you’re seeing but I will look very soon.

If it is hopefully this will resolve with a new pull request. If it doesn’t I will look at recreating this repo. It happened numerous times at the other repo and that seemed to be the fix.

If so I wonder if using the github client would prevent it.

Well we shall see. Getting up to get laptop out.

And with that if you haven’t slept yet please go get some sleep!

xexyl commented 1 year ago

It is exactly what I thought ... and I guess it is related to that problem. I'll see if I can make multiple pull requests soon to see if it works itself out. if not I'll have to re-fork this repo. Hopefully it's okay though. I am pretty sure it's from the branch issue I described above but whether deleting all the branches here will solve it or not I don't know.

Now go get some sleep 💤🛏️! and BCNU :-) (at least if you've not slept yet)

xexyl commented 1 year ago

With pull requests https://github.com/ioccc-src/temp-test-ioccc/pull/39 and https://github.com/ioccc-src/temp-test-ioccc/pull/40 we should find out if the problem persists after you merge them.

Of course the rest of the years have readmes (years' and the entries) to be updated as well but the 1984/README.md was a quick one I could test simply by updating the formatting.

Please let me know if it looks okay on your end too.