attempting to git apply the patch.txt, getting "patch does not apply" errors
Posted: Mon Nov 04, 2019 8:26 pm
Hello,
I really like this browser, i've been consistently using it for more than a year.
My laptop has a linux and i got tired of using the vanilla chromium on it, so I decided to attempt to compile advanced chromium for linux, but I havent reached that part yet.
I've been unable to git apply the patch.txt to the chromium project correctly.
This is the first time I've messed with git apply, so I'll just list what i attempted to do and hopefully that'll be useful
So at first i just cloned the chromium project and tried to git apply the patch to it, but i was faced with a bunch of "patch does not apply" errors for a lot of files. i assume this is because a lot of code has changed overtime since version 74.0.3860.0 and the patch requires the removal of lines of code that no longer exist in the current master head of the project.
The next thing i tried doing is to figure out to which commit i should checkout in order to restore the code to version 74.0.3860.0, and hopefully then git apply will be able to merge everything correctly. Since the file "chromium\chrome\VERSION" has the "MAJOR" and "BUILD" versions i just decided to use git log to find the commits when they were changed.
I used
>git log -SMAJOR=74"
which searched for the text "MAJOR=74" accross commits, and revealed the commits where it was changed from 73 to 74 and from 74 to 75, but the "BUILD" version naturally wasn't the correct one so instead i tried the next command with the build version alone instead
> git log -SBUILD=3860
this revealed the following commit
commit 815baef489e2df3dac63ae2100dbfa770a9adb85
Date: Sun Jul 21 03:14:31 2019 +0000
Updating trunk VERSION from 3859.0 to 3860.0
it looked promissing, so i used git checkout to switch to it
> git checkout 815baef489e2df3dac63ae2100dbfa770a9adb85
and then i checked the "chromium\chrome\VERSION" file to make sure im on the correct version of the code, but unfortunatelly the major version was 77 (77.0.3860.0) I tried a few other log searches but could not find anything close to the current advanced chromium version
later i found the google repo page, where it lists the chromium versions. The current advanced chromium version doesn't seem to be there either
in any case, i tried to apply the patch to this 77 version as well as a few others, but to no avail, i still got the "patch does not apply" error on all attempts.
which is the last chromium commit to which i should checkout to before applying the patch?
also, is this even the correct way to proceed when applying older patches to projects that have moved on?
Thanks!
I really like this browser, i've been consistently using it for more than a year.
My laptop has a linux and i got tired of using the vanilla chromium on it, so I decided to attempt to compile advanced chromium for linux, but I havent reached that part yet.
I've been unable to git apply the patch.txt to the chromium project correctly.
This is the first time I've messed with git apply, so I'll just list what i attempted to do and hopefully that'll be useful
So at first i just cloned the chromium project and tried to git apply the patch to it, but i was faced with a bunch of "patch does not apply" errors for a lot of files. i assume this is because a lot of code has changed overtime since version 74.0.3860.0 and the patch requires the removal of lines of code that no longer exist in the current master head of the project.
The next thing i tried doing is to figure out to which commit i should checkout in order to restore the code to version 74.0.3860.0, and hopefully then git apply will be able to merge everything correctly. Since the file "chromium\chrome\VERSION" has the "MAJOR" and "BUILD" versions i just decided to use git log to find the commits when they were changed.
I used
>git log -SMAJOR=74"
which searched for the text "MAJOR=74" accross commits, and revealed the commits where it was changed from 73 to 74 and from 74 to 75, but the "BUILD" version naturally wasn't the correct one so instead i tried the next command with the build version alone instead
> git log -SBUILD=3860
this revealed the following commit
commit 815baef489e2df3dac63ae2100dbfa770a9adb85
Date: Sun Jul 21 03:14:31 2019 +0000
Updating trunk VERSION from 3859.0 to 3860.0
it looked promissing, so i used git checkout to switch to it
> git checkout 815baef489e2df3dac63ae2100dbfa770a9adb85
and then i checked the "chromium\chrome\VERSION" file to make sure im on the correct version of the code, but unfortunatelly the major version was 77 (77.0.3860.0) I tried a few other log searches but could not find anything close to the current advanced chromium version
later i found the google repo page, where it lists the chromium versions. The current advanced chromium version doesn't seem to be there either
in any case, i tried to apply the patch to this 77 version as well as a few others, but to no avail, i still got the "patch does not apply" error on all attempts.
which is the last chromium commit to which i should checkout to before applying the patch?
also, is this even the correct way to proceed when applying older patches to projects that have moved on?
Thanks!