RFC: Fetch and merge upstream changes #152
Conversation
When importing an AUP project, selLow and selHigh may not be defined in the project. If not defined, this causes an error on initialising Nyquist. See: https://forum.audacityteam.org/viewtopic.php?f=48&t=118940
... in particular so that warnings on exit in the debug build on Windows are suppressed. Maybe it's not important to suppress them. Or maybe they suggest all is not correct in the MSVC implementation of this C++17 feature?
- James, Roger, Steve and Greg move to emeritus - Trademark text updated. - Dev team description changed.
This bug still available in case: using old settings file or manual set it into settings file.
|
Note: in order to keep proper history if these PRs are merged, they need to be in "rebase and merge" mode. |
|
|
That is very odd. I just cloned a brand new tenacity repo and created this PR, it should be 100% clean.. |
|
In general I would suggest the team always to rebase. patches on sr.ht mailing lists should should also applied with For additional info see https://git-rebase.io/ by Drew DeVault. |
|
I can manually merge things from CLI without issues, assuming not using |
|
Let me try again, I think I might have done something wrong... |
Signed-off-by: falkTX <[email protected]>
|
Recreated the repo now and force pushed, maybe good now? |
| CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | ||
| ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
There was a problem hiding this comment.
Because it generates merge conflicts even though the file is not present upstream.
Do we need it?
| @@ -54,5 +52,3 @@ void NonInterferingBase::operator delete(void *ptr, std::align_val_t al) | |||
| // Call through to default operator | |||
| ::operator delete(p); | |||
| } | |||
|
|
|||
| #endif | |||
| { return operator new(count, al); } | ||
| static void operator delete( | ||
| void *ptr, std::align_val_t al, int, const char *, int) | ||
| { return operator delete(ptr, al); } |
There was a problem hiding this comment.
Can't say anything about this either
|
Note that besides a little change in the README (linking to the site, similar to what audacity does) none of the changes here are from me but upstream |
|
What license are the upstream changes we are pulling? |
|
Small reminder: Please sign off your commits. Do this by: |
Brings changes from upstream master branch.
README.md and 3RDPARTY.txt files had conflicts.
README.md conflicts were easily resolved.
3RDPARTY.txt file is not present upstream, do we need it? Or delete it as well? (which I did here, not sure if correct)