git ubuntu clone applied default

Bug #1707367 reported by Robie Basak
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
git-ubuntu
Confirmed
Undecided
Robie Basak

Bug Description

I've wondered if git ubuntu clone should default to the applied branch, for our drive-by contributor who doesn't know about quilt use case.

The lint tool would need to pick up on this, to warn that upstream changes need to be made into quilt patches, and that non-upstream changes need to be rebased on the unapplied branch.

Perhaps this default should be configurable via XDG_CONFIG_DIRS (or git config gitubuntu), so that those who want to hit quilt directly can have it default to unapplied.

Tags: clone
Revision history for this message
Nish Aravamudan (nacc) wrote : Re: [Bug 1707367] [NEW] git ubuntu clone applied default

I think this goes back to the idea that submit and/or lint would be able to
determine if upstream changes have been made, transform "new" git commits
(commits relative to nearest pkg/ branch) into quilt patches (which might
fall if dpkg-source --commit fails) and provide (always) a
patches-unapplied version of any change(s) or emit a warning otherwise. A
nice sanity check is that in all cases where the above works, we should be
able to derive an original and new treeish of the upstream source and they
should match.

On Jul 29, 2017 02:20, "Robie Basak" <email address hidden> wrote:

> Public bug reported:
>
> I've wondered if git ubuntu clone should default to the applied branch,
> for our drive-by contributor who doesn't know about quilt use case.
>
> The lint tool would need to pick up on this, to warn that upstream
> changes need to be made into quilt patches, and that non-upstream
> changes need to be rebased on the unapplied branch.
>
> Perhaps this default should be configurable via XDG_CONFIG_DIRS (or git
> config gitubuntu), so that those who want to hit quilt directly can have
> it default to unapplied.
>
> ** Affects: usd-importer
> Importance: Undecided
> Status: New
>
> --
> 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/1707367
>
> Title:
> git ubuntu clone applied default
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/usd-importer/+bug/1707367/+subscriptions
>

Revision history for this message
Robie Basak (racb) wrote :

I'm not keen on automatic folding into quilt patches. What we want are any changes correctly squashed into the correct quilt patches. If a drive-by contributor isn't operating quilt directly, it seems unlikely that the squashing would get done first. I'm concerned that if we encourage use of automatic tooling that will be wrong, people will treat that as a shortcut to checking that it is done properly.

This has been, IMHO, the fate of merge-o-matic for example.

Nish Aravamudan (nacc)
Changed in usd-importer:
status: New → Confirmed
Robie Basak (racb)
Changed in usd-importer:
milestone: none → 1.0
Revision history for this message
Nish Aravamudan (nacc) wrote :

I'd like a policy decision (or perhaps a ubuntu-devel ML post) to decide this.

Changed in usd-importer:
assignee: nobody → Robie Basak (racb)
Revision history for this message
Nish Aravamudan (nacc) wrote :

And I think that with the quiltify/changelogify changes landed, that it's less controversial to use patches-applied by default.

Robie Basak (racb)
tags: added: clone
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.