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

remove a use added for a purpose which is gone in the meantime. #866

Merged
merged 1 commit into from
Jul 20, 2024

Conversation

killerbot242
Copy link
Contributor

The following comments explains why it was added, and that indeed it is no longer needed, as such.
https://github.com/jtv/libpqxx/issues/851#issuecomment-2213649992

Note that neither of these 2 cmake modules are for public use, they are internal cmake stuff.
Nothing on the outside should use it. This was feedback given by kitware developers.

    The following comments explains why it was added, and that indeed it is no longer needed, as such.
    jtv#851 (comment)

    Note that neither of these 2 cmake modules are for public use, they are internal cmake stuff.
    Nothing on the outside should use it. This was feedback given by kitware developers.
@jtv
Copy link
Owner

jtv commented Jul 20, 2024

Thanks for this, @killerbot242, @tt4g, and anyone else! I've taken a bit of a vacation even from libpqxx (forced in part :-) but really glad to find this resolution of the mystery waiting for me.

@jtv jtv merged commit 10b7903 into jtv:master Jul 20, 2024
6 checks passed
@killerbot242
Copy link
Contributor Author

small question, I had to fork the project to create this PR, how can I get the master of my fork to be aligned with the official project ? because that will be the base on my fork for the next PR.

@tt4g
Copy link
Contributor

tt4g commented Jul 20, 2024

@killerbot242 Add the original libpqxx repository under the name upstream, and then git pull into your repository to get the changes in: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-repository-for-a-fork

$ git remote add upstream https://github.com/jtv/libpqxx.git
$ git pull upstream master:master

@killerbot242
Copy link
Contributor Author

thanks tried that out, and seems to partially work:

git pull upstream master:master
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 5 (delta 2), reused 3 (delta 2), pack-reused 1
Unpacking objects: 100% (5/5), 1.84 KiB | 944.00 KiB/s, done.
From https://github.com/jtv/libpqxx
! [rejected] master -> master (non-fast-forward)

  • [new tag] 5.0.0 -> 5.0.0
  • [new tag] 5.0.1 -> 5.0.1
  • [new tag] 5.1.0 -> 5.1.0
  • [new tag] 6.0.0 -> 6.0.0
  • [new tag] 6.1.0 -> 6.1.0
  • [new tag] 6.1.1 -> 6.1.1
  • [new tag] 6.2.0 -> 6.2.0
  • [new tag] 6.2.2 -> 6.2.2
  • [new tag] 6.2.3 -> 6.2.3
  • [new tag] 6.2.4 -> 6.2.4
  • [new tag] 6.2.5 -> 6.2.5
  • [new tag] 6.3.0 -> 6.3.0
  • [new tag] 6.3.1 -> 6.3.1
  • [new tag] 6.3.2 -> 6.3.2
  • [new tag] 6.3.3 -> 6.3.3
  • [new tag] 6.4.0 -> 6.4.0
  • [new tag] 6.4.1 -> 6.4.1
  • [new tag] 6.4.2 -> 6.4.2
  • [new tag] 6.4.3 -> 6.4.3
  • [new tag] 6.4.4 -> 6.4.4
  • [new tag] 7.0.0 -> 7.0.0
  • [new tag] 7.0.1 -> 7.0.1
  • [new tag] 7.0.2 -> 7.0.2
  • [new tag] 7.0.3 -> 7.0.3
  • [new tag] 7.0.4 -> 7.0.4
  • [new tag] 7.0.5 -> 7.0.5
  • [new tag] 7.0.6 -> 7.0.6
  • [new tag] 7.0.7 -> 7.0.7
  • [new tag] 7.1.0 -> 7.1.0
  • [new tag] 7.1.1 -> 7.1.1
  • [new tag] 7.1.2 -> 7.1.2
  • [new tag] 7.2.0 -> 7.2.0
  • [new tag] 7.2.1 -> 7.2.1
  • [new tag] 7.3.0 -> 7.3.0
  • [new tag] 7.3.1 -> 7.3.1
  • [new tag] 7.4.0 -> 7.4.0
  • [new tag] 7.4.1 -> 7.4.1
  • [new tag] 7.5.0 -> 7.5.0
  • [new tag] 7.5.1 -> 7.5.1
  • [new tag] 7.5.2 -> 7.5.2
  • [new tag] 7.6.0 -> 7.6.0
  • [new tag] 7.7.0 -> 7.7.0
  • [new tag] 7.7.2 -> 7.7.2
  • [new tag] 7.7.3 -> 7.7.3
  • [new tag] 7.7.4 -> 7.7.4
  • [new tag] 7.8.0 -> 7.8.0
  • [new tag] 7.8.1 -> 7.8.1
  • [new tag] 7.9.0 -> 7.9.0
  • [new tag] 7.9.1 -> 7.9.1
  • [new branch] master -> upstream/master

but on master I don't see the result of the latest PR. my cmake/config.cmake is not what I should be

@tt4g
Copy link
Contributor

tt4g commented Jul 20, 2024

@killerbot242 Is your local git workspace a master branch?
You must checkout the master branch to edit the latest source code.

@killerbot242
Copy link
Contributor Author

i create each PR on a branch, and then on github a button offers me to create a PR. Once that is done I try to get my fork to be totally in sync. Again with a button on github this kind of works, I say kind of, because the second PR , correctly;y showed 1 change (made on a new branch for that purpose), but is kind of also mentioning the commits of the previous PR.

The suggest command lines did not bring my master up to date with the real repo, the button on github did, to be honest the content of the window it displays at the sync time is confusing to me.

@tt4g
Copy link
Contributor

tt4g commented Jul 21, 2024

This is how git works.
The mechanics of git are explained on many websites, so I recommend that you search and find out how git works.

@jtv
Copy link
Owner

jtv commented Jul 21, 2024

@killerbot242 you do need to go back to the master branch before creating your new branch. Otherwise you'll be creating your new branch based on whatever branch you were previously working on.

@killerbot242
Copy link
Contributor Author

i create each PR on a branch, and then on github a button offers me to create a PR. Once that is done I try to get my fork to be totally in sync. Again with a button on github this kind of works, I say kind of, because the second PR , correctly;y showed 1 change (made on a new branch for that purpose), but is kind of also mentioning the commits of the previous PR.

The suggest command lines did not bring my master up to date with the real repo, the button on github did, to be honest the content of the window it displays at the sync time is confusing to me.

@jtv
Copy link
Owner

jtv commented Jul 28, 2024

Honestly, I too find this pretty confusing. If I knew what to do off the top of my head, I would gladly have told you.

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.

3 participants