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

Gemstone2.4 dev #138

Merged
merged 151 commits into from
Feb 1, 2015
Merged

Gemstone2.4 dev #138

merged 151 commits into from
Feb 1, 2015

Conversation

dalehenrich
Copy link
Owner

successful test of the bugfix against GsDevKit/GsDevKit ... bugfix for Issue #136

Dale Henrichs added 30 commits April 8, 2012 09:38
- port to GemStone2.4
  9 run, 9 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes

Conflicts:
	repository/MonticelloFileTree-Core.package/monticello.meta/version
	tests/repository/MonticelloFileTree-Tests.package/monticello.meta/version
Conflicts:
	repository/MonticelloFileTree-Core.package/monticello.meta/version
	tests/repository/MonticelloFileTree-Tests.package/MCFileTreeLoaderTest.class/properties.json
	tests/repository/MonticelloFileTree-Tests.package/monticello.meta/version
  changed upToEnd to use #contents ...
  defer moving methods to GLASS till later, will need a coordinated set
    of commits between GemStone 2.4 and 3.1
need confirmation from Peter than the fixes work for GemStone3.1
12 run, 12 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes
Conflicts:
	repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addMethodDefinitionsForClass.methodProperties.in..st
	repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeDefinitions..st
	repository/MonticelloFileTree-Core.package/monticello.meta/version
	tests/repository/MonticelloFileTree-Tests.package/MCFileTreeGenericLoaderTest.class/instance/tearDownPackages..st
	tests/repository/MonticelloFileTree-Tests.package/monticello.meta/version
dalehenrich and others added 28 commits September 2, 2014 15:08
 MCFileTreeStCypressWriter>>fileNameForSelector: needed for tODE
update install instructions to use GsUpgrader
Support non-standard selectors with colons
Conflicts:
	repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/fileNameForSelector..st
…hod category are not consistent with the package name
@dalehenrich dalehenrich merged commit b224f8b into gemstone2.4 Feb 1, 2015
@dalehenrich
Copy link
Owner Author

boy what a whacky commit history ... oh well, the end result appears to be correct

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants