Skip to content

/ brave-browser

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

Jump to bottom

Split patch generation into multiple files #36

Closed
kevinlawler opened this issue Dec 16, 2017 · 1 comment
Closed

Split patch generation into multiple files #36

kevinlawler opened this issue Dec 16, 2017 · 1 comment
Assignees
@kevinlawler
Labels
QA/No
Milestone
0.55.x - Release ...

Comments

@kevinlawler
Copy link
Contributor

@kevinlawler kevinlawler commented Dec 16, 2017 

a good task for someone would be splitting the automated patch generation into multiple files
It will help a lot with reducing merge conflicts
@kevinlawler kevinlawler self-assigned this Dec 16, 2017
kevinlawler referenced this issue Dec 16, 2017
@kevinlawler
change `npm run update_patches` to generate one file per Modified file
f8a4248 
and one big file for Deleted files
for issue brave/brave#36
kevinlawler referenced this issue Dec 16, 2017
@kevinlawler
change `npm run update_patches` to generate one file per Modified file
c0033ed 
and one big file for Deleted files
for issue brave/brave#36

settings_brave_strings.grd -> settings_brave_strings.grdp

use shields branch

Copy extnesion manifest to chrome subdir

Change node version
kevinlawler referenced this issue Dec 16, 2017
@kevinlawler
change `npm run update_patches` to generate one file per Modified file
d22fd97 
and one big file for Deleted files
for issue brave/brave#36
@kevinlawler kevinlawler mentioned this issue Dec 16, 2017
Merged
kevinlawler referenced this issue in brave/brave-core Dec 29, 2017
@kevinlawler
patchfile modifications: split master_patch.patch using new utility
2f014f8 
outside issue: brave/brave#36
outside pr:    brave/brave#37
@kevinlawler kevinlawler mentioned this issue Dec 29, 2017
Merged
kevinlawler referenced this issue Dec 29, 2017
@kevinlawler
change `npm run update_patches` to generate one file per Modified file
0a1811c 
and one big file for Deleted files
for issue brave/brave#36

fixes from pr comments:
use '-' as separator
only need to replace '/' not '\\'
kevinlawler referenced this issue Dec 29, 2017
@kevinlawler
change `npm run update_patches` to generate one file per Modified file
29eae05 
and one big file for Deleted files
for issue brave/brave#36

fixes from pr comments:
use '-' as separator
only need to replace '/' not '\\'
kevinlawler referenced this issue in brave/brave-core Dec 29, 2017
@kevinlawler
patchfile modifications: split master_patch.patch using new utility
49f25e5 
outside issue: brave/brave#36
outside pr:    brave/brave#37

standardize to a/ b/ diff prefixes
kevinlawler referenced this issue Dec 29, 2017
@kevinlawler
change `npm run update_patches` to generate one file per Modified file
fb79dd6 
and one big file for Deleted files
for issue brave/brave#36

fixes from pr comments:
use '-' as separator
only need to replace '/' not '\\'

standardize diff prefixes to a/ and b/
kevinlawler referenced this issue Dec 29, 2017
@kevinlawler
change `npm run update_patches` to generate one file per Modified file
35f7cd1 
and one big file for Deleted files
for issue brave/brave#36

fixes from pr comments:
use '-' as separator
only need to replace '/' not '\\'

standardize diff prefixes to a/ and b/

don't create master deleted patch
kevinlawler referenced this issue in brave/brave-core Dec 29, 2017
@kevinlawler
patchfile modifications: split master_patch.patch using new utility
f7600a2 
outside issue: brave/brave#36
outside pr:    brave/brave#37

standardize to a/ b/ diff prefixes

remove master_deleted_patch
This was referenced Dec 29, 2017
Merged
Merged
@bbondy
Copy link
Member

@bbondy bbondy commented Dec 31, 2017

Merged, so closing this.
@bbondy bbondy closed this Dec 31, 2017
cezaraugusto pushed a commit that referenced this issue May 15, 2018
@bbondy
Merge pull request #36 from brave/redirect-output-2
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
dbe71c0 
Fix redirect output for commands without /c on Win
@bbondy bbondy added this to the Releasable builds milestone Jun 14, 2018
@bbondy bbondy added the QA/No label Aug 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@kevinlawler kevinlawler

Labels
QA/No
Projects
None yet
Milestone
  0.55.x - Release ...
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
2 participants
@kevinlawler @bbondy
You can’t perform that action at this time.