-
-
Notifications
You must be signed in to change notification settings - Fork 31
Add boneyard branch for obsolete content. #126
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
This (mostly) reverts commit cc29a3b. It does not reinstate the Makefile change, to avoid conflcts in the future.
|
@mascguy Your should be able to "merge" this by something like:
Or maybe the latter needs to specify You could use a different local branch name if Aside from the general new-branch issue, this branch configuration has two unusual but useful properties:
|
|
Given that the repo is very locked-down for safety, it may not be possible to maintain a separate branch like this. But I'll have to test. Alternatively, could we simply include them - similar to your disabled tests - in a top-level 'obsolete' directory? |
|
@mascguy I'm not aware of the "locked-down" aspect (and the "Security" section of this repo is empty), though if it's just a list of allowed branches, that shouldn't be too hard to fix (with the appropriate access). As I mentioned, I don't think it's possible to create a new branch with a PR, but that has nothing to do with being "locked-down". You could just try the fetch/push and see what happens. And of course, after the fetch, you have the code in your own repo, where you can peruse it at will before pushing it. The "disabled" directory isn't for disabled tests - it's for some code that implements a feature whose introduction apparently caused breakage. That was originally worked around by the uglier hack of having code in the Portfile to delete the bad source before building the port. Moving the code out of the source directory had the same effect without the ugly Portfile hack. It was always my intention to resurrect (and repair) that code at some point, though Marcus never responded to my query about what it was helping and how it broke. I have a guess as to the latter, but I'd have to reinvent an understanding of the feature from scratch in order to write a suitable test for it (none ever existed before). Meanwhile, the "disabled" directory keeps it more on the radar. :-) |
I misspoke a bit here, since the new branch already includes the master content, but merging with a future version of the master branch would do the above. Is it possible that the "locked-down" aspect you're referring to is just the block on merge commits, which AFAIK applies to In general, there seems to be an all-or-nothing attitude toward merge commits, with some projects using them for every PR merge, and others treating them as abject evil. AFAIK, no SCM other than git has the merge-commit concept at all, so that people coming to git from other SCMs are unfamiliar with them, and hence resistant to them. IMO, it's best to understand the pros and cons of merges vs. rebases, and use each where it's most appropriate (though admittedly it's not always cut-and-dried). The short-form difference is that merges have a history which is honest but not linear, while rebases have a history which is linear but not honest (though fast-forwards are both). I don't expect this branch to get updated very often, though I believe that that can be done via PRs once it exists, as long as it's specified as the target branch in the PR. |
See README-boneyard.
The remaining diff is just the resurrected content.