Tooling (or process) doesn't handle VCS- fields

Bug #1595744 reported by Jon Grimm
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
git-ubuntu
Triaged
Low
Nish Aravamudan
ubuntu-dev-tools (Ubuntu)
In Progress
Undecided
Nish Aravamudan

Bug Description

Currently the process says:

"Commit any debian/control metadata (VCS, Maintainer) for one rebase step with commit message 'update-metadata'."

,and then later during creation of the logical delta:

"Interactively rebase the deconstructed Ubuntu delta and drop 'changelog' and 'update-metadata' changes.
These changes will be easily reproducible from this process and will lead to merge conflicts with the final rebase."

...

VCS-* field deltas such as the following will get lost

-Vcs-Git: git://git.debian.org/git/pkg-mozilla/nspr.git
-Vcs-Browser: http://git.debian.org/?p=pkg-mozilla/nspr.git
+XS-Debian-Vcs-Git: git://git.debian.org/git/pkg-mozilla/nspr.git
+XS-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-mozilla/nspr.git

Tooling or process fix likely required.

Tags: workflow

Related branches

Revision history for this message
Nish Aravamudan (nacc) wrote :

Hey Robie,

So we do need to clean up this documentation a bit, but I was wondering if you think we should just drop this delta? That is, I think the only reason to have a Xs-Debian-* field is if we are replacing it (like we do with the maintainer). Given the lack of UDD/bzr trees for source packages in Ubuntu, I think we don't need to carry the delta.

At the same time, is there a tool that updates the VCS informtion like `update-maintainer`? Do we want to extend `update-metadata` to do this?

-Nish

Revision history for this message
Robie Basak (racb) wrote : Re: [Bug 1595744] Re: Tooling (or process) doesn't handle VCS- fields

Hi Nish,

On Tue, Jul 26, 2016 at 01:53:11PM -0000, Nish Aravamudan wrote:
> So we do need to clean up this documentation a bit, but I was wondering
> if you think we should just drop this delta? That is, I think the only
> reason to have a Xs-Debian-* field is if we are replacing it (like we do
> with the maintainer). Given the lack of UDD/bzr trees for source
> packages in Ubuntu, I think we don't need to carry the delta.

I'm interested to know what the ubuntu-devel ML thinks of this. I have
no strong opinion either way, but I do think there's value in being
consistent. Consistency would help with onboarding, documentation and
automation with tooling.

> At the same time, is there a tool that updates the VCS informtion like
> `update-maintainer`? Do we want to extend `update-metadata` to do this?

I wonder if we should teach 'update-maintainer' to do whatever
ubuntu-devel ML consensus is that we should do, and possibly rename it
if required.

I believe some (Ubuntu) teams do maintain their delta in VCS, and so do
add the field.

If we are adding our own VCS trees, then I suppose that cannot easily be
automated - but at least the rename of the original VCS could be done by
a tool, and then addition of our own VCS trees could be an actual part
of the delta. Exceptionally, just like update-maintainer, I don't think
there's any need to document such a delta in the changelog. Perhaps our
tooling could learn this somehow.

Revision history for this message
Nish Aravamudan (nacc) wrote :

On Tue, Jul 26, 2016 at 4:29 PM, Robie Basak <email address hidden> wrote:
> Hi Nish,
>
> On Tue, Jul 26, 2016 at 01:53:11PM -0000, Nish Aravamudan wrote:
>> So we do need to clean up this documentation a bit, but I was wondering
>> if you think we should just drop this delta? That is, I think the only
>> reason to have a Xs-Debian-* field is if we are replacing it (like we do
>> with the maintainer). Given the lack of UDD/bzr trees for source
>> packages in Ubuntu, I think we don't need to carry the delta.
>
> I'm interested to know what the ubuntu-devel ML thinks of this. I have
> no strong opinion either way, but I do think there's value in being
> consistent. Consistency would help with onboarding, documentation and
> automation with tooling.
>
>> At the same time, is there a tool that updates the VCS informtion like
>> `update-maintainer`? Do we want to extend `update-metadata` to do this?
>
> I wonder if we should teach 'update-maintainer' to do whatever
> ubuntu-devel ML consensus is that we should do, and possibly rename it
> if required.
>
> I believe some (Ubuntu) teams do maintain their delta in VCS, and so do
> add the field.
>
> If we are adding our own VCS trees, then I suppose that cannot easily be
> automated - but at least the rename of the original VCS could be done by
> a tool, and then addition of our own VCS trees could be an actual part
> of the delta. Exceptionally, just like update-maintainer, I don't think
> there's any need to document such a delta in the changelog. Perhaps our
> tooling could learn this somehow.

Makes total sense to me. I will work on writing something up this week.

I will say the reason this is even a thing we noticed is that we can't
simply drop the changes (or have the be combined with a
'update-metadata' commit) in our process during the rebase, as there
isn't a tool that can 'replay' them like `update-maintainer` does.

Nish Aravamudan (nacc)
Changed in usd-importer:
status: New → In Progress
assignee: nobody → Nish Aravamudan (nacc)
importance: Undecided → Low
Nish Aravamudan (nacc)
Changed in ubuntu-dev-tools (Ubuntu):
status: New → In Progress
assignee: nobody → Nish Aravamudan (nacc)
Revision history for this message
Robie Basak (racb) wrote :

Also see bug 1707327

Nish Aravamudan (nacc)
Changed in usd-importer:
milestone: none → 1.0
status: In Progress → Triaged
Robie Basak (racb)
tags: added: workflow
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.