pool/python-pygit2
SHA256
11
0
Fork 4
Code Issues Pull Requests Activity

Clean up spec file to enable building on leap #1

Closed
sfalken wants to merge 6 commits from (deleted):factory into factory
pull from: (deleted):factory
merge into: pool:factory
Conversation 11 Commits 6 Files Changed 5 +51 -12
sfalken commented 2024-10-19 02:40:30 +02:00
First-time contributor
Copy Link

Fixes buildfailure on Leap, patches were dropped, but the conditional was left in the spec file.

Fixes buildfailure on Leap, patches were dropped, but the conditional was left in the spec file.
sfalken added 1 commit 2024-10-19 02:40:30 +02:00
Clean up spec file to enable building on leap 2ba852cf70
mcepl commented 2025-03-05 10:04:34 +01:00
Contributor
Copy Link

@sfalken This is either empty PR or at least needs to be rebased on the top of pool/factory.

@sfalken This is either empty PR or at least needs to be rebased on the top of `pool/factory`.
sfalken commented 2025-03-05 16:30:36 +01:00
Author
First-time contributor
Copy Link

I have no idea what that means. There's a commit and 2 files changed, based on what I'm looking at.

What do you mean "empty PR" ?

I have no idea what that means. There's a commit and 2 files changed, based on what I'm looking at. What do you mean "empty PR" ?
adamm commented 2025-03-06 10:51:27 +01:00
First-time contributor
Copy Link

You need to rebase your changes on top of pool/python-pygit2 factory branch. The diff is against your older version and there are conflicts in the .changes file.

You need to rebase your changes on top of `pool/python-pygit2` factory branch. The diff is against your older version and there are conflicts in the .changes file.
sfalken added 5 commits 2025-03-06 19:42:54 +01:00
Ignore _scmsync.obsinfo 2329f0566b
Update to 1.16.0: 088468fed2 
- Add support for Python 3.13
  - Drop support for Python 3.9
  - New Repository.hashfile(...)
  - New Option.GET_MWINDOW_FILE_LIMIT and
    Option.SET_MWINDOW_FILE_LIMIT
  - Fix overriding certificate_check(...) callback via argument
    to RemoteCallbacks(...)
  - Add py.typed
  - Fix discover_repository(...) annotation
Add const-parents.patch to fix FTBFS (gh#libgit2/pygit2!1324).
update to 1.17.0 cd37398006
Remove upstreamed const-parents.patch. 052219c0fc
Clean up spec file to enable building on leap 9c9879d7d1
sfalken commented 2025-03-06 19:43:35 +01:00
Author
First-time contributor
Copy Link

I think I did that right.

I think I did that right.
mcepl commented 2025-03-07 09:29:11 +01:00
Contributor
Copy Link

I think I did that right.

That seems a rather optimistic statement:

mitmanek:python-pygit2 (sfalken) $ git fsck
Checking object directories: 100% (256/256), done.
Checking objects: 100% (336/336), done.
dangling tree 2847d4bee54d8f12bde5cb686120c8239e93310146b42a5be2f2d63050e9c87a
Verifying commits in commit graph: 100% (106/106), done.
mitmanek:python-pygit2 (sfalken) $ git rebase origin/factory
warning: skipped previously applied commit 2329f05
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config set advice.skippedCherryPicks false"
Auto-merging python-pygit2.changes
CONFLICT (content): Merge conflict in python-pygit2.changes
Auto-merging python-pygit2.spec
error: could not apply 2ba852c... Clean up spec file to enable building on leap
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 2ba852c... Clean up spec file to enable building on leap
mitmanek:python-pygit2 (sfalken *+|REBASE 1/5) $
> I think I did that right. That seems a rather optimistic statement: ``` mitmanek:python-pygit2 (sfalken) $ git fsck Checking object directories: 100% (256/256), done. Checking objects: 100% (336/336), done. dangling tree 2847d4bee54d8f12bde5cb686120c8239e93310146b42a5be2f2d63050e9c87a Verifying commits in commit graph: 100% (106/106), done. mitmanek:python-pygit2 (sfalken) $ git rebase origin/factory warning: skipped previously applied commit 2329f05 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config set advice.skippedCherryPicks false" Auto-merging python-pygit2.changes CONFLICT (content): Merge conflict in python-pygit2.changes Auto-merging python-pygit2.spec error: could not apply 2ba852c... Clean up spec file to enable building on leap hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". hint: Disable this message with "git config set advice.mergeConflict false" Could not apply 2ba852c... Clean up spec file to enable building on leap mitmanek:python-pygit2 (sfalken *+|REBASE 1/5) $ ```
sfalken commented 2025-03-07 18:42:48 +01:00
Author
First-time contributor
Copy Link

Then it can just stay broken. I don't have time to wade through this half broken mess of a workflow.

Then it can just stay broken. I don't have time to wade through this half broken mess of a workflow.
sfalken closed this pull request 2025-03-07 18:42:49 +01:00
adamm commented 2025-03-10 10:32:36 +01:00
First-time contributor
Copy Link

It's not the workflow here... It's simply git. Look

https://src.opensuse.org/sfalken/python-pygit2/src/branch/factory

says "This branch is 6 commits behind pool/python-pygit2:factory"

git rebase is not cherry picking other stuff that was missing, which is what you've appeared to have done. git rebase puts your changes on top of Factory.

It's not the workflow here... It's simply git. Look https://src.opensuse.org/sfalken/python-pygit2/src/branch/factory says "This branch is 6 commits behind pool/python-pygit2:factory" `git rebase` is not cherry picking other stuff that was missing, which is what you've appeared to have done. `git rebase` puts your changes on top of Factory.
adamm commented 2025-03-10 10:39:55 +01:00
First-time contributor
Copy Link

So, I've looked at this trying to merge this change .... and there's nothing to apply because

8f774c3b9f (diff-b2e7f83b7484cae11bfecf6a91f99c0051fa57c3)

@mcepl has already fixed this 4 months ago in this changeset.

So, I've looked at this trying to merge this change .... and there's nothing to apply because https://src.opensuse.org/pool/python-pygit2/commit/8f774c3b9f40d04f66a46759d57c82ef5d71a8e1989bc375a9493ec49c78810e#diff-b2e7f83b7484cae11bfecf6a91f99c0051fa57c3 @mcepl has already fixed this 4 months ago in this changeset.
jsulig commented 2025-03-11 11:19:01 +01:00
First-time contributor
Copy Link

This PR was not empty when @sfalken created it on Oct 19.
8f774c3b9f was committed on Nov 5.

This PR was not empty when @sfalken created it on Oct 19. 8f774c3b9f was committed on Nov 5.
adamm commented 2025-03-11 11:51:47 +01:00
First-time contributor
Copy Link

You are correct... I guess this highlights the need to have devel projects and not just one giant /pool with direct submissions, where PR can get lost much more easily. (we still plan on having /pool for factory and SLE and other official stuff, but that is going to be managed via projects, so these PRs should not get lost like this one did)

You are correct... I guess this highlights the need to have devel projects and not just one giant `/pool` with direct submissions, where PR can get lost much more easily. (we still plan on having /pool for factory and SLE and other official stuff, but that is going to be managed via projects, so these PRs should not get lost like this one did)
mcepl commented 2025-03-11 20:51:36 +01:00
Contributor
Copy Link

This PR was not empty when @sfalken created it on Oct 19.
8f774c3b9f was committed on Nov 5.

Auch, I have missed how old this PR was! I am sorry for that.

> This PR was not empty when @sfalken created it on Oct 19. > 8f774c3b9f was committed on Nov 5. Auch, I have missed how old this PR was! I am sorry for that.

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
adamm_super adrianSuSE autobuild-owner autogits_workflow_pr_bot bigironman dirkmueller factory_bot gitea_test legaldb lkocman-factory maxlin_factory smithfarm
No Assignees
4 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: pool/python-pygit2#1
No description provided.
Delete Branch "(deleted):factory"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?