-
Notifications
You must be signed in to change notification settings - Fork 833
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
Fix conversion on various files #8135
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rebase+reconciliation needed.
CONFLICT (content): Merge conflict in src/tls.c
looks good otherwise.
a9e5938
to
172edaf
Compare
retest this please |
@gasbytes please share how you produced these conversion warnings. Which complier and what build steps. Thank you |
@gasbytes please squash. |
@dgarske
And this is the configuration, followed just by a
|
ced378f
to
e2b509a
Compare
Retest this please:
|
has a slew of conflicts relative to current
it's a mystery to me why github thinks "Merging can be performed automatically"... |
I think this might be because I resolved those conflicts using GitHub's web editor, but I'm not entirely sure why GitHub now says the merge can be performed automatically. As far as I can tell, those files don’t seem to have any breaking changes compared to master, so that might also be a reason. |
Working on a couple more Renesas specific. |
ae87fa0
to
2d7de44
Compare
Retest this please (history lost) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
needs another round of rebase reconciliation:
CONFLICT (content): Merge conflict in wolfcrypt/src/misc.c
CONFLICT (content): Merge conflict in wolfcrypt/src/port/Renesas/renesas_fspsm_util.c
bb67432
to
9756eac
Compare
retest this please (numerous inexplicable test timeouts) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gasbytes -- unfortunately, the history on your branch needs to be completely reset, and the changes need to be reapplied manually relative to master
.
The problem is that you did a "Merge branch 'master' into fix-conversion", rather than a git rebase master
that would have properly preserved the upstream history.
See the git log
for the crazy log entry concatenating a hundred or so commit messages and attributing it to @LinuxJedi for reasons unknown. ("200 files changed, 8520 insertions(+), 2959 deletions(-)") That commit is not in the history of master
and shouldn't be in it.
Also this branch now has at least one unwanted and unrelated change in it, to configure.ac
, and you're going to need to go through the entire change set to make sure there aren't any others.
One way to fix the mess, tested locally:
git checkout master
git pull upstream master
git checkout fix-conversion
git reset --soft master
git diff master configure.ac | git apply --reverse
git commit -n -a
This will create a single new commit with all your changes except for the configure.ac
change, directly atop current master
, with a perfectly clean history.
As long as that change to configure.ac
was the only mistaken one, that'll do the trick.
399d293
to
c5469d1
Compare
Retest this please |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The branch has many unintended and unwanted changes, all of them in a single commit at the head.
With the branch checked out,
git show --stat HEAD
shows the problem.
280 files changed, 7111 insertions(+), 8905 deletions(-)
8f21d6f
to
2b807b5
Compare
2b807b5
to
bb81de0
Compare
These ones were linux specific (x86_64 on Void Linux).
Most of them were automated using a shell script that I wrote locally, that uses a vim interactive shell.
Working on the next block of files.
Testing: "gcc (GCC) 13.2.0"