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

[Buried headers] Change for the CMake-related files #5

Open
wants to merge 20 commits into
base: master
Choose a base branch
from

Conversation

da115115
Copy link
Owner

Insulated the changes, derived from burying the headers, around CMake-related files only.

@da115115
Copy link
Owner Author

That pull request has been replaced by two other pull requests allowing to insulate specifically the changes respectively related to the source code and to the CMake-related framework.
The two new pull requests are:

Note, though, that the pull requests are made against the master branch. Therefore, all the changes related to the directory structure change appear, but are not relevant here. I you want to see only the changes on the source code and/or the CMake-related framework, you can do the following on your local clone:
#==========================
git clone git://github.com/denisarnaud/soci.git socigit

cd socigit
git checkout master
git checkout src
git checkout src_build
git checkout src_buried_headers
git checkout src_build_buried_headers

To see the differences pertaining to the source code

git checkout src
git diff src_buried_headers ^src

To see the differences pertaining to the CMake-related framework

git checkout src_build
git diff src_build_buried_headers ^src
#==========================
In order to apply the changes:
git checkout src
git merge src_buried_headers
git checkout src_build
git merge src_build_buried_headers

git checkout master
git merge -s subtree --squash --no-commit src
git merge -s subtree --squash --no-commit src_build

git stat
git diff --cached

If there are some issues

git reset HEAD *
git checkout -- *

da115115 pushed a commit that referenced this pull request May 22, 2013
Backend is not set properly with connection pool
da115115 pushed a commit that referenced this pull request May 22, 2013
* Ensure connection is established and backend set for session (thanks
to @kzeslaf for reporting this)
* Add test_pull5 to ensure no crash occurs (see Krzysztof's example in
pull #5 comments)
* Add test0 testing connection ensured
* Add test31 with basic use of connection_pool (no multiple threads,
sequential use only)
da115115 pushed a commit that referenced this pull request May 22, 2013
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.

1 participant