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

Bugfix concat path #164

Merged
merged 5 commits into from
Jan 17, 2025
Merged

Bugfix concat path #164

merged 5 commits into from
Jan 17, 2025

Conversation

trondth
Copy link
Contributor

@trondth trondth commented Jan 17, 2025

No description provided.

Copy link

Triggered from #164 by @​trondth.

Checking if we can fast forward master (40aa685) to bugfix_concat_path (78e85e9).

Target branch (master):

commit 40aa685fada031846ea1093b9602d72473b902ed (HEAD -> master, origin/master, origin/HEAD)
Author: Trond Thorbjørnsen <[email protected]>
Date:   Wed Jan 15 15:51:25 2025 +0100

    fix concatenation for resumables

Pull request (bugfix_concat_path):

commit 78e85e9447a0d5339dd0f6d20e3a4869ecf4b58c (pull_request/bugfix_concat_path)
Author: Trond Thorbjørnsen <[email protected]>
Date:   Fri Jan 17 10:41:53 2025 +0100

    add pytest as dev dependency

Can't fast forward master (40aa685) to bugfix_concat_path (78e85e9). master (40aa685) is not a direct ancestor of bugfix_concat_path (78e85e9). Branches appear to have diverged at 7395aaf:

* 78e85e9447a0d5339dd0f6d20e3a4869ecf4b58c add pytest as dev dependency
* d6ac28b3c0567b69dbe05c1016e2d06312039cf7 fix double slashes in stream/{group} when group is empty
* c1c53e6b03241a27c05d95dd04a19ce1c449ff7e add simple manual tests
* 7b92ca76d6d345648dd33026b491e130420fc165 fix concatenation for resumables
* 7545e9213dd3550c9cf4a5b0ce3a3a3a6a4fdaf6 use pathlib for concatenating paths
| * 40aa685fada031846ea1093b9602d72473b902ed fix concatenation for resumables
| * a6bda19c5d0a28fbe939a88890674f9a9fcb6012 use pathlib for concatenating paths
|/  
* 7395aaf8382e82d80127cf04d6f0352150c77c32 fix: Switch to using Optional to preserve compatibility with 3.9

commit 7395aaf8382e82d80127cf04d6f0352150c77c32 (tag: v3.6.3)
Author: Milen Kouylekov <[email protected]>
Date:   Wed Nov 6 12:57:47 2024 +0100

    fix: Switch to using Optional to preserve compatibility with 3.9

Rebase locally, and then force push to bugfix_concat_path.

Copy link
Collaborator

@leondutoit leondutoit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

@trondth trondth merged commit 7c65625 into master Jan 17, 2025
2 of 3 checks passed
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.

2 participants