#1334 cannot merge 1.17.0 tag into 1.16.2 branch?!?
Closed: Invalid by mikem. Opened by h01ger.

hi, trying to package koji 1.17.0 for Debian...

$ git tag --verify koji-1.16.2
object 35d8d3ec4cf45c78c0cc9ed613963b05492d8123
type commit
tag koji-1.16.2
tagger Mike McLean mikem@redhat.com 1550757088 -0500

Koji 1.16.2
gpg: Signature made Thu Feb 21 14:51:28 2019 CET
gpg: using RSA key 8E326D464C8DA725
gpg: Good signature from "Mike McLean mikem@redhat.com" [unknown]
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: 00CC B085 25C6 5644 7F1B EE40 8E32 6D46 4C8D A725
$ git checkout koji-1.16.2
Note: checking out 'koji-1.16.2'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

git checkout -b

HEAD is now at 35d8d3ec... bump version to 1.16.2
debian-work:~/Projects/reproducible/koji$ git checkout -b foo
Switched to a new branch 'foo'
$ git tag --verify koji-1.17.0
object 532697efb31da00926116ba566fd62a80435930f
type commit
tag koji-1.17.0
tagger Mike McLean mikem@redhat.com 1551885897 -0500

Koji 1.17.0
gpg: Signature made Wed Mar 6 16:24:57 2019 CET
gpg: using RSA key 8E326D464C8DA725
gpg: Good signature from "Mike McLean mikem@redhat.com" [unknown]
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: 00CC B085 25C6 5644 7F1B EE40 8E32 6D46 4C8D A725
$ git merge koji-1.17.0
Auto-merging vm/kojivmd
Auto-merging vm/kojikamid.py
Auto-merging util/kojira
Auto-merging util/koji-shadow
Auto-merging util/koji-gc
Auto-merging tests/test_lib/test_tasks.py
Auto-merging tests/test_lib/test_restart_tasks.py
Auto-merging tests/test_lib/test_policy.py
Auto-merging tests/test_lib/test_parsers.py
Auto-merging tests/test_lib/test_krbv.py
Auto-merging tests/test_lib/test_fixEncoding.py
Auto-merging tests/test_lib/test_auth.py
Auto-merging tests/test_hub/test_rpmdiff.py
CONFLICT (content): Merge conflict in tests/test_hub/test_rpmdiff.py
Auto-merging tests/test_hub/test_list_hosts.py
CONFLICT (content): Merge conflict in tests/test_hub/test_list_hosts.py
Auto-merging tests/test_hub/test_list_archives.py
CONFLICT (content): Merge conflict in tests/test_hub/test_list_archives.py
Auto-merging setup.py
CONFLICT (content): Merge conflict in setup.py
Removing plugins/hub/messagebus.py
Removing plugins/hub/messagebus.conf
Auto-merging koji/rpmdiff.py
Auto-merging koji/context.py
CONFLICT (content): Merge conflict in koji/context.py
Auto-merging koji/init.py
Auto-merging koji.spec
CONFLICT (content): Merge conflict in koji.spec
Auto-merging hub/kojihub.py
Auto-merging docs/source/release_notes.rst
CONFLICT (content): Merge conflict in docs/source/release_notes.rst
Auto-merging docs/source/conf.py
CONFLICT (content): Merge conflict in docs/source/conf.py
Auto-merging cli/koji_cli/lib.py
CONFLICT (content): Merge conflict in cli/koji_cli/lib.py
Auto-merging cli/koji_cli/commands.py
CONFLICT (content): Merge conflict in cli/koji_cli/commands.py
Auto-merging builder/mergerepos
Auto-merging builder/kojid
Automatic merge failed; fix conflicts and then commit the result.
debian-work:~/Projects/reproducible/koji$

Am I missing something obvious?


The koji-1.16.2 tag is part of the koji-1.16-updates branch, and has cherry-picks and unique changes for specifically that version series.

Please start over from the 1.17.0 tag when packaging 1.17.0.

Also, why are you dealing with the upstream source tree for packaging? They should be cleanly separate...

On Fri, Mar 08, 2019 at 08:37:52PM +0000, Neal Gompa wrote:

ngompa added a new comment to an issue you are following:
The koji-1.16.2 tag is part of the koji-1.16-updates branch, and has =
cherry-picks and unique changes for specifically that version series.

ah, that makes sense, thanks.

(and indeed, I master I could just merge 1.17.0, but I tried that in my
debian branch first, which is based on 16.2...)

Please start over from the 1.17.0 tag when packaging 1.17.0.

will do.

--=20
tschau,
Holger

---------------------------------------------------------------------------=

           holger@(debian|reproducible-builds|layer-acht).org
   PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C

Metadata Update from @mikem:
- Issue close_status updated to: Invalid
- Issue status updated to: Closed (was: Open)

This issue has been migrated to Fedora Forge:
https://forge.fedoraproject.org/koji/koji/issues/1334

Please continue any further discussion there.

Metadata