Multiple issues on re-merges - tag conflicts, non pushed tags, ...

[Christian Ehrhardt ]

Hi,
today on a set of merges we realized that the tags logical/deconstruct/reconstruct were not pushed.

I also happened to find that the old/new tags are kind of overlapping - it correctly pushed the new set of those, but locally they still point to the old merge I've done last cycle.

The first issue breaks the review - e.g. the linter.
And the second one can be misleading e.g. the following seems it would be an update to the current state, but it would make the MP incorrect by forcing the old state of th elast merge over the current one.
$ git push paelzer --force-with-lease new/debian old/ubuntu old/debian

Trying to reproduce with a full log

[Christian Ehrhardt  (paelzer)]

Note: I'm on edge (335) at the moment, the following is the full log for

In the log I do:
1. clone
   # you see it clones old new/old/logical/reconstruct tags from my paelzer repo (from last merge)
2. start merge
   # creates reconstruct as it should
3. rebase and create tags (simplified as this is just to show the error)
   # just trivial changes to have all three tags
4. rebase to new debian
   # I just get it applying the actual merge has no meaning
4. finish merge
   # I have all usual tags and my merge branch, shown with a grep of tags
5. submit
   # working fine it seems

But after this the logical/deconstruct/reconstruct tags are missing, see [1]
Note I might later on at some point do the merge for real then the tags will be there by me manual pushing it - but as of today they are missing.
I also didn't see any pushing of them.

Git status of the tags after git ubuntu submit is
$ git ls-remote --tags paelzer
# you see there is no 5.5.1-4ubuntu3
# new/old debian are there, but those of the last merge (also shown in the log as a simulated force push and a check of the hashes (5.6.0-2 is the correct new one, but the remote still has 5.5.1-3)

[1]: https://git.launchpad.net/~paelzer/ubuntu/+source/strongswan/refs/?h=bionic-merge-show-bug-1733492&id=ce5511bf61581d94ea2d4c1864dbf639f01adb74

[Christian Ehrhardt  (paelzer)]

Did the same with the stable snap, same result

MP: https://git.launchpad.net/~paelzer/ubuntu/+source/strongswan?h=bionic-merge-show-bug-1733492-stablesnap

Log is attached.

So maybe this is less of a regression with new code, but something that always had happened if you already had a merge in the remote repo from before?

[Christian Ehrhardt  (paelzer)]

I wanted to do the same with a namspace set via --bug but I always end up at
 $ git ubuntu tag --logical --bug testnamespace1733492
 11/21/2017 09:01:53 - ERROR:HEAD is not a defined object in this git repository.

Maybe a different issue, for now lets focus on the one we can reproduce in this bug.

[Nish Aravamudan (nacc)]

Submit does not know what a merge is and never pushed tags. If you need to
push tags, you should push them separately. In fact, the only thing we push
is the branch that is to be merged.

MPs are branch to branch, not related to tags.

We could add a for-merge option that understands to push relevant tags
although it might be tricky to figure out what
reconstruct/deconstruct/logical tags to push. The old/new debian/ubuntu are
unversioned so they are easy.

On Nov 21, 2017 13:41, "ChristianEhrhardt" <email address hidden>
wrote:

> I wanted to do the same with a namspace set via --bug but I always end up
> at
> $ git ubuntu tag --logical --bug testnamespace1733492
> 11/21/2017 09:01:53 - ERROR:HEAD is not a defined object in this git
> repository.
>
> Maybe a different issue, for now lets focus on the one we can reproduce
> in this bug.
>
> --
> You received this bug notification because you are a member of Ubuntu
> Server Dev import team, which is subscribed to usd-importer.
> https://bugs.launchpad.net/bugs/1733492
>
> Title:
> Multiple issues on re-merges - tag conflicts, non pushed tags, ...
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/usd-importer/+bug/1733492/+subscriptions
>

[Nish Aravamudan (nacc)]

Are you in a detached head state? Can you provide what git show HEAD says?

On Nov 21, 2017 13:41, "ChristianEhrhardt" <email address hidden>
wrote:

I wanted to do the same with a namspace set via --bug but I always end up at
 $ git ubuntu tag --logical --bug testnamespace1733492
 11/21/2017 09:01:53 - ERROR:HEAD is not a defined object in this git
repository.

Maybe a different issue, for now lets focus on the one we can reproduce
in this bug.

--
You received this bug notification because you are a member of Ubuntu
Server Dev import team, which is subscribed to usd-importer.
https://bugs.launchpad.net/bugs/1733492

Title:
  Multiple issues on re-merges - tag conflicts, non pushed tags, ...

To manage notifications about this bug go to:
https://bugs.launchpad.net/usd-importer/+bug/1733492/+subscriptions

[Christian Ehrhardt  (paelzer)]

Hi Nish,
due to my console config this is already in the log.
Also as I outlined it really reproduces in 100% of the time, so someone else could try to run the same commands and check if it happens for you as well.

Anyway - on the detached head, while not all characters get to the log as I see them it is still readable.
Seach for lines with "[paelzer@lap", you'll find
1. the path I'm in at the moment
2. to the right the current git head (so at the beginning detached but after the checkout -b for the merge on that branch.

[Christian Ehrhardt  (paelzer)]

BTW I'm +1 on your suggestion of a submit "for-merge" option.
I even think the tags are not hard, they are the same you derive in "git ubuntu tag" but for the version that referenced as "old/ubuntu".
All of this needs the usual --bug namespace code as well as it could be <bug>/old/ubuntu.
But overall you already have all code, just need to tie it together in a new way for this.

Until then good to know that we are supposed to push everything on top of the branch on our own for now.