Skip to content
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

Split patches #37

Merged
merged 1 commit into from Dec 29, 2017
Merged

Split patches #37

merged 1 commit into from Dec 29, 2017

Conversation

@kevinlawler
Copy link
Contributor

kevinlawler commented Dec 16, 2017

brave/brave#36

@kevinlawler kevinlawler requested review from bridiver and bbondy Dec 16, 2017
@kevinlawler kevinlawler force-pushed the split-patches branch from 98d97e6 to c0033ed Dec 16, 2017
@kevinlawler kevinlawler force-pushed the split-patches branch from c0033ed to 5ab2540 Dec 16, 2017
@kevinlawler kevinlawler reopened this Dec 16, 2017
// When splitting one large diff into a per-file diff, there are a few ways
// you can go about it. Because different files can have the same name
// (by being located in different directories), you need to avoid collisions.
// Mirroring the directory structure seems undesirable.

This comment has been minimized.

Copy link
@bridiver

bridiver Dec 19, 2017

Collaborator

I'm not sure that it is undesirable. I think we should either mimic the actual directory structure or make the directory part of the file name (net/base/network_delegate.cc -> net-base-network_delegate.cc)

This comment has been minimized.

Copy link
@bridiver

bridiver Dec 19, 2017

Collaborator

the reason is that if I'm searching for a particular patch file, I want an easy way to identify it without looking at the actual contents

This comment has been minimized.

Copy link
@kevinlawler

kevinlawler Dec 19, 2017

Author Contributor

The way it currently works is net/base/network_delegate.cc -> net.base.network_delegate.cc

This comment has been minimized.

Copy link
@kevinlawler

kevinlawler Dec 19, 2017

Author Contributor

(We can make it do dashes by changing desiredReplacementString)

This comment has been minimized.

Copy link
@bridiver

bridiver Dec 20, 2017

Collaborator

oops, misread it. Yea, let's use - instead

}

if (replacingBackslashes) {
revised = revised.replace(/\\/g, desiredReplacementString)

This comment has been minimized.

Copy link
@bridiver

bridiver Dec 20, 2017

Collaborator

git always uses forward slashes, right?

@bridiver
Copy link
Collaborator

bridiver commented Dec 21, 2017

this looks good, but we should probably do an antimuon PR as well to actually split them

kevinlawler referenced this pull request in brave/brave-core Dec 29, 2017
outside issue: brave/brave#36
outside pr:    brave/brave#37
@kevinlawler kevinlawler force-pushed the split-patches branch 2 times, most recently from 0a1811c to 29eae05 Dec 29, 2017
Copy link
Collaborator

bridiver left a comment

++

console.log('updatePatches wrote ' + (1 + i) + '/' + n + ': ' + filename)
}

// finish off by creating one big patch for deleted files

This comment has been minimized.

Copy link
@bridiver

bridiver Dec 29, 2017

Collaborator

I think we can probably leave this out. I can't think of any reason why we would need to delete a file vs patching a build script to leave it out

kevinlawler referenced this pull request in brave/brave-core Dec 29, 2017
outside issue: brave/brave#36
outside pr:    brave/brave#37

standardize to a/ b/ diff prefixes
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 kevinlawler force-pushed the split-patches branch from 29eae05 to fb79dd6 Dec 29, 2017
@bridiver bridiver merged commit 3fdf2ab into master Dec 29, 2017
@bridiver bridiver mentioned this pull request Dec 29, 2017
kevinlawler referenced this pull request in brave/brave-core Dec 29, 2017
outside issue: brave/brave#36
outside pr:    brave/brave#37

standardize to a/ b/ diff prefixes

remove master_deleted_patch
cezaraugusto pushed a commit that referenced this pull request May 15, 2018
Build and use dump_syms on Windows and Mac
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.