Closed jpopelka closed 3 years ago
I'm gonna start by creating a test case for this.
I'd love to point out that we should create a new branch and not update existing c8 source-git branch with content from c8s
Do you mean that I should create c8s
branch or that I should create some c8-updated
branch or what?
Ok, let's take an easier example, acl
package has only c8
branch in dist-git as well as in source-git. If I'm told to regenerate the source-git package how should I do it?
CONTAINER_CMD="dist2src -v convert rpms/acl:c8 source-git/acl:c8" make run
(which in my case results in the same issue as reported here)CONTAINER_CMD="dist2src -v convert rpms/acl:c8 source-git/acl:c8-updated" make run
I'm gonna start by creating a test case for this.
Do you have any work-around for me meanwhile? (because I'm seeing it every time)
I would say you should use CONTAINER_CMD="dist2src -v convert rpms/acl:c8 source-git/acl:c8" make run
See this example update on rpm. It builds the new source-git changes on the top of the c8s
branch, create imports/c8s/rpm-4.14.3-4.el8
branch and lastly move the c8s
to the HEAD of that imports branch.
If there is a problem with that, we should fix it.
I'd love to point out that we should create a new branch and not update existing c8 source-git branch with content from c8s
OK, if we don't want to move the old branch, we should have to make optional the last step (moving the HEAD of the branch) that I described in the last comment.
sorry, missed these comments, reading just now
the guidance I'd love to give is keep things in the same structure as they are in dist-git right now - when we update repos, we should always update the same branches in source-git, so it should always be:
$ dist2src convert dist-git:branch source-git:branch
we should not move changes between c8 and c8s
luckily, the update mechanism "reverts" all previous changes so we can always recover if something bad happens, that's awesome!
does this help?