importers/git-importer
3
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firewalld creates a broken tree with merged commits in wrong order #14

New Issue
Closed
opened 2022-11-03 12:40:35 +01:00 by Ghost · 4 comments
Ghost commented 2022-11-03 12:40:35 +01:00
Copy Link

Test case in 19c252b7de

- commit: openSUSE:Factory/firewalld/35.0
  merged:
  - security:netfilter/firewalld/82.0
  - security:netfilter/firewalld/81.0
  - security:netfilter/firewalld/80.0
- commit: openSUSE:Factory/firewalld/34.0
  merged:
  - security:netfilter/firewalld/77.0
  - security:netfilter/firewalld/76.0
  - security:netfilter/firewalld/75.0
- commit: openSUSE:Factory/firewalld/33.0
  merged:
  - security:netfilter/firewalld/79.0
  - security:netfilter/firewalld/78.0
- commit: openSUSE:Factory/firewalld/32.0
  merged:
  - security:netfilter/firewalld/74.0
- commit: openSUSE:Factory/firewalld/31.0
- commit: openSUSE:Factory/firewalld/30.0
  merged:
  - security:netfilter/firewalld/71.0
- commit: openSUSE:Factory/firewalld/29.0

I assume this is about a revert happening

Test case in https://gitea.opensuse.org/importers/git-importer/commit/19c252b7dea35ed80b1b69f298a322074774f996 ``` - commit: openSUSE:Factory/firewalld/35.0 merged: - security:netfilter/firewalld/82.0 - security:netfilter/firewalld/81.0 - security:netfilter/firewalld/80.0 - commit: openSUSE:Factory/firewalld/34.0 merged: - security:netfilter/firewalld/77.0 - security:netfilter/firewalld/76.0 - security:netfilter/firewalld/75.0 - commit: openSUSE:Factory/firewalld/33.0 merged: - security:netfilter/firewalld/79.0 - security:netfilter/firewalld/78.0 - commit: openSUSE:Factory/firewalld/32.0 merged: - security:netfilter/firewalld/74.0 - commit: openSUSE:Factory/firewalld/31.0 - commit: openSUSE:Factory/firewalld/30.0 merged: - security:netfilter/firewalld/71.0 - commit: openSUSE:Factory/firewalld/29.0 ``` I assume this is about a revert happening
Ghost commented 2022-11-03 14:35:43 +01:00
Author
Copy Link

firewalld was unlinked from factory in revision 73

Factory Revision Request devel rev
30 622082 71
31 <REVERT to 29> ~69
32 627580 74
33 629404 79
34 631960 77
35 633723 82

So the tree builder is actually correct, but it's tricky how to model this. This is basically impossible for git.

firewalld was unlinked from factory in revision 73 | Factory Revision | Request | devel rev | | -------- | -------- | -------- | | 30 | 622082 | 71 | | 31 | <REVERT to 29> | ~69 | | 32 | 627580 | 74 | | 33 | 629404 | 79 | | 34 | 631960 | 77 | | 35 | 633723 | 82 | So the tree builder is actually correct, but it's tricky how to model this. This is basically impossible for git.
Ghost commented 2022-11-03 14:38:48 +01:00
Author
Copy Link

The interesting parts are unfortunately between pages, but the old importer got problems with this too:

image

The interesting parts are unfortunately between pages, but the old importer got problems with this too: ![image](/attachments/df01887a-f48f-44c8-93b9-480ff1df3234)
image.png
225 KiB
aplanas commented 2022-11-03 14:42:11 +01:00
Owner
Copy Link

Can this be the expected mapping?

- commit: openSUSE:Factory/firewalld/31.0
  merged:
  - revert: openSUSE:Factory/firewalld/30.0
- commit: openSUSE:Factory/firewalld/30.0
  merged:
  - security:netfilter/firewalld/71.0
- commit: openSUSE:Factory/firewalld/29.0
Can this be the expected mapping? ``` - commit: openSUSE:Factory/firewalld/31.0 merged: - revert: openSUSE:Factory/firewalld/30.0 - commit: openSUSE:Factory/firewalld/30.0 merged: - security:netfilter/firewalld/71.0 - commit: openSUSE:Factory/firewalld/29.0 ```
aplanas reopened this issue 2022-11-03 14:43:35 +01:00
Ghost commented 2022-11-03 14:54:12 +01:00
Author
Copy Link

This will have to do:
image

The red arrow marks the request not recorded

This will have to do: ![image](/attachments/bb6cb40e-46d8-46a7-9312-cf53e526d1a3) The red arrow marks the request not recorded
image.png
232 KiB
image.png
71 KiB
image.png
Ghost closed this issue 2022-11-03 15:35:52 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: importers/git-importer#14
No description provided.
Delete Branch "%!s()"

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?