Not sure if you would be interested in this many more patches. I removed sneaky throw patch and updated SHA tag for Clojure to the latest, since the Clojure team committed that one. #1

Merged
merged 14 commits into from Mar 30, 2012

Conversation

Projects
None yet
2 participants
Contributor

jafingerhut commented Mar 6, 2012

build.sh now applies patches using 'git am' instead of patch. A bit
slower, but it preserves info about the developers who created the
patches.

It also now applies the patches in the order specified in the file
patch-order.txt. There are some pairs of patches that apply cleanly
in one order but not the opposite order.

jafingerhut added some commits Mar 6, 2012

@jafingerhut jafingerhut Add many patches, and modify build.sh
build.sh now applies patches using 'git am' instead of patch.  A bit
slower, but it preserves info about the developers who created the
patches.

It also now applies the patches in the order specified in the file
patch-order.txt.  There are some pairs of patches that apply cleanly
in one order but not the opposite order.
06a45eb
@jafingerhut jafingerhut Add 3 more patches. 1f4a782
@jafingerhut jafingerhut Add a patch for CLJ-700
Because of carriage returns at the end of lines, the only way I could
figure out how to make this patch apply with 'git am' is to add the
--keep-cr option.
6561a09
@jafingerhut jafingerhut Added patch for CLJ-157 efff756
@jafingerhut jafingerhut Add patch for CLJ-788 286546e
@jafingerhut jafingerhut Add patch for CLJ-818 0af0835
@jafingerhut jafingerhut Updated CLJ-917 patch 485ddac
@jafingerhut jafingerhut Update build.sh to start from latest commit to master on March 9, 2012. 0065d27
@jafingerhut jafingerhut Update starting point to latest Clojure master of March 13, 2012
Also remove patch for CLJ-860, which was applied to master recently.
56acb61
@jafingerhut jafingerhut Added patches for CLJ-952 and CLJ-953. 693900c
@jafingerhut jafingerhut Add README 21a57b1
@jafingerhut jafingerhut Remove patches already applied to Clojure master on Mar 23 2012
Also update a couple of patches that needed tweaks to apply cleanly.
e77e67b
@jafingerhut jafingerhut Make README file more future-proof. 19063b6
@jafingerhut jafingerhut Update a few patches, add a few. 2202804

@hiredman hiredman added a commit that referenced this pull request Mar 30, 2012

@hiredman hiredman Merge pull request #1 from jafingerhut/master
Not sure if you would be interested in this many more patches.  I removed sneaky throw patch and updated SHA tag for Clojure to the latest, since the Clojure team committed that one.
57e6124

@hiredman hiredman merged commit 57e6124 into hiredman:master Mar 30, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment