Revert merge from master #10277

seamuslee001 · 2017-04-28T12:42:27Z

No description provided.

…g per payment processor for recurring contributions

…tion with DAO-based approach.

The <value> tag only appeared once in all the schema defintion files thus it seemed to me to be a typo of the (no longer used) <values> tag. Also, I searched CRM/Core/CodeGen/Specification.php for ["']value["'] and found no occurences which makes me think this tag is not parsed.

There were 72 occurences of <type>CheckBox</type> and only 1 occurence of <type>Checkbox</type> So it seemed like "Checkbox" was a typo. Thus I changed it to "CheckBox"

There were 59 occurences of <type>TextArea</type> and only 2 occurences of <type>TexArea</type> So it seemed like "TexArea" was a typo. Thus I changed it to "TextArea"

There were 5 occurences of <change> and only 1 occurence of <modify> So it seemed like <modify> was a typo. Thus I changed it to <change>

…is called on activities. I limited this to activities as there are only 2 separate values & I thought it would keep it readable.

…is called to get contribution_status_id

… is called

… function to run the SQL piece. This means that sourceSQLFile no longer has an 'isQueryString' variable, which was used to pass an SQL query in the filename parameter.

(NFC) CRM-20308 Fix Test due to not truncating civicrm_email table

CRM-20459 replace last instances where CRM_Core_OptionGroup::getValue…

CRM-20459 replace all instances where CRM_Core_OptionGroup::getValue …

This will affect new installs only per discussion on the ticket. Motivation dependent, we could add a method to convert on existing installs. Note some fields, like event_start_date might have a case for being in a non-timezone aware format

4.7.19 rc

CRM-20459 replace all instances where CRM_Core_OptionGroup::getValue …

CRM-20435: Replace SQL-based activityContact creation with DAO-based approach.

…eSQLFile_rework CRM-20428: refactored sourceSQLFile

…g contribution, with sales tax enabled

CRM-9683 implement timezone support for CiviMail.

Remove unused var. emailActivityTypeIDs is retrieved twice, statusTit…

CRM-20481 temporarily switch back while we assess / fix performance i…

…nline additional payments

seamuslee001 · 2017-04-28T12:43:04Z

@eileenmcnaughton i think you broke the RC with this c85b067 because it moved it to .20. I believe this correctly reverts that commit pining @davejenx as well

seamuslee001 · 2017-04-28T12:44:46Z

I think we should probably revert this as well 3c8e8aa

eileenmcnaughton · 2017-04-28T12:45:43Z

ug did I - that seems like a very big commit!

seamuslee001 · 2017-04-28T12:46:00Z

yeh

eileenmcnaughton · 2017-04-28T12:48:48Z

Yuck yuck yuck - expletitives! I did have this moment when something wierd happened but!!!

seamuslee001 · 2017-04-28T12:50:52Z

@eileenmcnaughton i have reverted the other merge from master just as a precautionary measure

eileenmcnaughton · 2017-04-28T12:51:42Z

oh - so I merge the wrong way around???

seamuslee001 · 2017-04-28T12:54:49Z

@eileenmcnaughton i think so, I think you were hoping to merge 4.7.19 -> master not master -> 4.7.19

eileenmcnaughton · 2017-04-28T12:54:58Z

This seems to be the PR - but is says into master #10266

seamuslee001 · 2017-04-28T12:56:54Z

I think you were trying to fix jenkins issues so this c85b067 and 3c8e8aa are the problem commits

eileenmcnaughton · 2017-04-28T12:58:34Z

That's so confusing - I see 2 separate things on this screen

seamuslee001 · 2017-04-28T12:59:53Z

so the overall PR was merged into master but that commit was merging master branch into 4.7,19 and i think its only showing what elements of that commit make up part of the PR i think

seamuslee001 · 2017-04-28T13:03:40Z

Jenkins test this please

eileenmcnaughton · 2017-04-28T13:08:27Z

OK - that seems like you are right to me - I think we should let @guanhuan @totten @colemanw know & merge this on pass

If we feel like normality is not returned we should consider skipping a release.

Offending PR link is #10266

seamuslee001 · 2017-04-28T13:35:04Z

Jenkins test this please

totten · 2017-04-28T19:09:43Z

After we fix this, I expect folks will habitually resume the practice of forward-porting RC fixes to master -- but wouldn't that cause a sort of reverberation where the revert ultimately applies to master?

Feels like we need to either:

Do a revert like Revert merge from master #10277; then all forward-porting via cherry-pick?
Do a rewrite of the history (force-push) so that this never happened?

totten · 2017-04-28T20:19:32Z

That's so confusing - I see 2 separate things on this screen
...
Offending PR link is #10266

I think it's confusing because #10266 didn't actually cause the problematic merge, but it's one of the few places where the problematic merge is visible. Pay close attention to the text of the merge message:

"Merge branch 'master' into 4.7.19-rc" ==> that's how it looks if you use git merge.
If this had been done through the Github UI, then it'd say something like "Merge pull request CRM-20270 - composer.lock - Fix multibyte warnings by updating ezcMail #9982 from eileenmcnaughton/4.7.19-rc2".

Theory:

Something like this was done via CLI: git checkout 4.7.19-rc ... git merge master ... git push origin 4.7.19-rc.
(Plausible? Well, some folks use a personal dev-branch with the same name as the canonical branch, and then it's easy to mix-up: git push myuser 4.7.19-rc and git push origin 4.7.19-rc.)
Later on, 4.7.19 rc #10266 aimed at forward-porting 4.7.19-rc changes to master. The errant merge commit appears in the history, but it's basically a nullop (because master already has master commits), so it hardly registers as a blip in the Github UI.

eileenmcnaughton · 2017-04-28T21:32:41Z

I did have a moment when I was trying to merge something into 4.7.19 & suddenly it was already there - I checked my repos to see if I had pushed to 4.7.19rc but it's set up via https - which means entering a username & password

upstream https://github.com/civicrm/civicrm-core.git

adixon and others added 30 commits November 30, 2016 15:00

CRM-19697 Do not make use of the static _links object when customizin…

afcaa7e

…g per payment processor for recurring contributions

Fix unsubscribe group list

96fce13

CRM-20435: Conservative replacement of SQL-based activityContact crea…

a857867

…tion with DAO-based approach.

Add test

9629f52

CRM-20172: Added test and fix for correct amounts.

15816cb

CRM-20453 - XML schema clean up: Checkbox

66ca562

There were 72 occurences of <type>CheckBox</type> and only 1 occurence of <type>Checkbox</type> So it seemed like "Checkbox" was a typo. Thus I changed it to "CheckBox"

CRM-20453 - XML schema clean up: TexArea

d993a2c

There were 59 occurences of <type>TextArea</type> and only 2 occurences of <type>TexArea</type> So it seemed like "TexArea" was a typo. Thus I changed it to "TextArea"

CRM-20453 - XML schema clean up: <modify>

a816265

There were 5 occurences of <change> and only 1 occurence of <modify> So it seemed like <modify> was a typo. Thus I changed it to <change>

CRM-20459 replace all instances where CRM_Core_OptionGroup::getValue …

d66c61b

…is called on activities. I limited this to activities as there are only 2 separate values & I thought it would keep it readable.

CRM-20459 replace all instances where CRM_Core_OptionGroup::getValue …

f527e01

…is called to get contribution_status_id

CRM-20459 replace last instances where CRM_Core_OptionGroup::getValue…

a28ce73

… is called

CRM-20461 - Call post hook after updating additional participant status

29a5959

CRM-20463 - simplify parsing of doc URLs and ensure all work.

1e6b547

Set version to 4.7.20

9caf6ce

CRM-20172: more thorough handling of params.

7f5ae3a

CRM-20308 Fix Test due to not truncating civicrm_email table

e88906f

Refactored CRM-20428. Refactored sourceSQLFile by creating a separate…

c0e4c31

… function to run the SQL piece. This means that sourceSQLFile no longer has an 'isQueryString' variable, which was used to pass an SQL query in the filename parameter.

Merge pull request civicrm#10213 from seamuslee001/master

b6436ee

(NFC) CRM-20308 Fix Test due to not truncating civicrm_email table

Merge pull request civicrm#10203 from eileenmcnaughton/deprecate3

036b901

CRM-20459 replace last instances where CRM_Core_OptionGroup::getValue…

Merge pull request civicrm#10201 from eileenmcnaughton/deprecate2

8639c83

CRM-20459 replace all instances where CRM_Core_OptionGroup::getValue …

Merge pull request civicrm#10215 from civicrm/4.7.19-rc

5dedf5e

4.7.19 rc

CRM-9683 regenerate DAOs

6c2b97b

Merge pull request civicrm#10200 from eileenmcnaughton/deprecate

d969ad8

CRM-20459 replace all instances where CRM_Core_OptionGroup::getValue …

Merge pull request civicrm#10168 from GinkgoFJG/CRM-20435

0710631

CRM-20435: Replace SQL-based activityContact creation with DAO-based approach.

Merge pull request civicrm#10216 from JohnFF/refactor/CRM-20428_sourc…

bc1b1f8

…eSQLFile_rework CRM-20428: refactored sourceSQLFile

CRM-20260 fix data errors creation in financial_line_item when editin…

cf28d07

…g contribution, with sales tax enabled

CRM-20260, Added Unit test

ffa4c20

Merge pull request civicrm#10154 from eileenmcnaughton/timestamp

83ac183

CRM-9683 implement timezone support for CiviMail.

eileenmcnaughton and others added 7 commits April 28, 2017 08:57

Merge pull request civicrm#10263 from eileenmcnaughton/case

a78982f

Remove unused var. emailActivityTypeIDs is retrieved twice, statusTit…

CRM-20481 temporarily switch back while we assess / fix performance

6ab43e1

Merge pull request civicrm#10261 from eileenmcnaughton/activitybackout

670a76d

CRM-20481 temporarily switch back while we assess / fix performance i…

Merge branch 'master' into 4.7.19-rc

3c8e8aa

CRM-20493 Payment instrument id is incorrectly a required field for o…

43c6eb8

…nline additional payments

Fix merge conflict

7873f40

Revert merge from master

de94185

civicrm-builder added the 4.7.19-rc label Apr 28, 2017

Revert 3c8e8aa as well

a19618a

Fix issues on revert

01d9821

totten force-pushed the 4.7.19-rc branch from 7873f40 to 91c8d7e Compare April 28, 2017 22:16

totten closed this Apr 28, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert merge from master #10277

Revert merge from master #10277

seamuslee001 commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017 •

edited

Loading

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

totten commented Apr 28, 2017

totten commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

Revert merge from master #10277

Revert merge from master #10277

Conversation

seamuslee001 commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017 • edited Loading

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017

totten commented Apr 28, 2017

totten commented Apr 28, 2017

eileenmcnaughton commented Apr 28, 2017

seamuslee001 commented Apr 28, 2017 •

edited

Loading