Multiple issues on re-merges - tag conflicts, non pushed tags, ...
Bug #1733492 reported by
Christian Ehrhardt
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
git-ubuntu |
New
|
Undecided
|
Unassigned |
Bug Description
Hi,
today on a set of merges we realized that the tags logical/
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
Note: I'm on edge (335) at the moment, the following is the full log for
In the log I do: logical/ reconstruct tags from my paelzer repo (from last merge)
1. clone
# you see it clones old new/old/
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=ce5511bf6158 1d94ea2d4c1864d bf639f01adb74