Vcs-Git metadata in .changes but not used by git-ubuntu

[Steve Langasek]

http://launchpadlibrarian.net/677722797/init-system-helpers_1.65.2ubuntu1_source.changes shows an upload to Ubuntu that included the Vcs-Git* fields that are supposed to be used for merging the rich history rather than generating it from the archive.

I was surprised when doing a merge of this package today to find that I could not gu-build because a push to my repository was not a fast-forward - because the rich history had not been merged by git-ubuntu.

Is this because this is a native package? something else?

[Dimitri John Ledkov (xnox)]

Do the fields in the changes, also had prior git-ubuntu history merged into them?

As in merge old git-ubuntu history, with like resolve strategy to pick mine?

[Steve Langasek (vorlon)]

Here's another one, which is not a native package. http://launchpadlibrarian.net/689988109/e2guardian_5.3.5-4.1ubuntu1_source.changes

[Robie Basak (racb)]

In init-system-helpers 1.65.2, the rich history you supplied did not match your actual upload. In this case, git-ubuntu favours the latter for correctness (otherwise git-ubuntu users would not be able to trust that git-ubuntu repositories actually match the archive):

$ diff -u supplied-rich-history actual-upload|egrep '^(\+|-)'
--- supplied-rich-history 2023-12-11 09:29:15.609681150 +0000
+++ actual-upload 2023-12-11 09:29:33.333815779 +0000
-040000 tree a878a94f6d18eae8db7ab0a6ce7b92bf6e2059bb man8
+040000 tree 528eed73850b3186b6e8fbe44655da21def5a438 man8
+100644 blob ae12b6c13d24b470d467690a2671359654edcc49 man8/invoke-rc.d.8
+100644 blob d3a194ef1f65738cda7ae223d24f56b6b23baccc man8/service.8
+100644 blob 4395e6f1419f07941a75d639714c14f9ad952fe1 man8/update-rc.d.8
-040000 tree c779effdbc790807fdd088d26ce25c94e46527a9 script
+040000 tree 7635a57ddfe4ebb81c5fa5324d8841c3e8be99a8 script
+100644 blob ba6727566126cc577d02e14b5f8ef670a5c45628 script/deb-systemd-helper.1p
+100644 blob 20d3bc35c1c30f443c1e9eb0514327b362cc5f43 script/deb-systemd-invoke.1p

Is this a problem with the clean target? Anyway, I'm sure you can take it from here.

From git-ubuntu's perspective e2guardian 5.3.5-4.1ubuntu1 has the same issue:

$ diff -u supplied-rich-history actual-upload|egrep '^(\+|-)'
--- supplied-rich-history 2023-12-11 09:35:59.284612451 +0000
+++ actual-upload 2023-12-11 09:35:51.320556756 +0000
-040000 tree 174c55f3f09bea500e97bf9bb9c82a7331db3d76 configs
+040000 tree 539aece2dcc80ccae8e2cb51dd93a2853d307c92 configs
-040000 tree d68dbb67a8b9674ac20d7b7d1e3de8b660855ae0 configs/contentscanners
+040000 tree 2dbca9066859c8588d6378cf82229a128fca294d configs/contentscanners
-100755 blob 4500e0a1d86a629fd2e4fb736caef613f543c444 configs/contentscanners/clamdscan.conf.in
+100755 blob 7ef3800fd43af2c96ba9e4d15c4680d986234a21 configs/contentscanners/clamdscan.conf.in
-100755 blob 36929342214730225c8bbc41c4509af1b100b2ee configs/e2guardian.conf.in
-100755 blob faaa5e312dac4351cbd3a95e1ff0c67cec85be67 configs/e2guardianf1.conf.in
+100755 blob 8855d8d6bbbf47ab0a0e3b5a4f096ecd9b310495 configs/e2guardian.conf.in
+100755 blob 8cf90f9ed58ac68ea5efa71be672caf9912882db configs/e2guardianf1.conf.in
-040000 tree 3fab74967f087e18fc3fa9f44ca93413051796e9 configs/lists
+040000 tree ed2630477cebaf1a5b318297a7016487bd1bd893 configs/lists
-100755 blob 575294b073fdfb18a7e72418dc77b96a09287bea configs/lists/bannedsitelist.in
+100755 blob 7d60af8641af1df98d8c249adffada8d44e30805 configs/lists/bannedsitelist.in
-100755 blob 4f3b5b34b6dafbc37847d3e66043b41ae3ea70db configs/lists/exceptionsitelist
+100755 blob 776b5019974445c800ad6469e23b5ef12642a2d2 configs/lists/exceptionsitelist
-100644 blob 209e36e34428867e3f24a3afa8f1db45b95172ca configure.ac
+100644 blob 996cf05f6cd1cfec971f976760c68f0a696276a5 configure.ac
-040000 tree 910c73d44e8e2f541f092ef70ef3f69154c347c0 doc
+040000 tree 07cb4463a77aae4cf1538327c2021fe9974bd4ec doc
-100755 blob 3fcc1b9611ec76c081ca7c6a6a81c70f7d819d61 doc/e2guardian.8
+100755 blob 1ae2ea7cda788be7e804223ae30ba824c05fea4d doc/e2guardian.8
-040000 tree e578462d2ca4565deba198a2d52aad05e5ab0d8e notes
+040000 tree 74150e40f2e237e7bbdffadbb2eb3ed2443ef620 no...