Launchpad itself

UDD Docs should discuss pre-requisite branch setting in merge proposals

Bug #509901 reported by Barry Warsaw
20
This bug affects 3 people
Affects Status Importance Assigned to Milestone
Launchpad itself
Invalid
Undecided
Unassigned
Ubuntu Distributed Development
Won't Fix
Undecided
Unassigned

Bug Description

When using Ubuntu Distributed Development to make changes to distro packages, the automatically generated diffs aren't quite right. Non-Ubuntu developers need to have their changes reviewed by a sponsor, and the sponsors want to see different diffs than what code hosting produces.

For example, I made a change to python-distribute which merged the latest Debian package into the lp:ubuntu/lucid/distribute code. I made a few small changes and pushed a branch for review. However, my sponsor did not want to see the diff between my branch and lp:ubuntu/lucid/distribute, he wanted to see the diff between my branch and lp:debian/sid/distribute.

Distro package branches might even need multiple diffs, one against current Ubuntu and another against current Debian, as well as changes in the branch under review.

Tags: lp-code udd
Andrew Starr-Bochicchio (andrewsomething)
tags: added: udd
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

https://code.edge.launchpad.net/~barry/ubuntu/lucid/distribute/sync-to-sid/+merge/17425
Original merge proposal.

https://code.edge.launchpad.net/~dmitrij.ledkov/ubuntu/lucid/distribute/sync-to-sid/+merge/17728
Merge proposal with lp:debian/sid/distribute set as prerequiste.

Note the source branch is direct ancestor of the sid branch. You can do bzr pull the proposed source branch from target.

But the diff generated by launchpad has merge conflicts. Expected is the output of bzr diff --new lp:debian/sid/distribute but it's not.

I'll attach these branches and lp diff output in a moment.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Right I've created static merge proposals for archival purposes:

https://code.edge.launchpad.net/~dmitrij.ledkov/ubuntu/lucid/distribute/sync-to-sid/+merge/17730
https://code.edge.launchpad.net/~dmitrij.ledkov/ubuntu/lucid/distribute/sync-to-sid-2/+merge/17731

The 17731 merge proposal has errororous diff. I'll see if there is bug reported about that already.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

  affects launchpad-code
  status invalid
  affects udd
  summary "Documentation should recommend setting pre-requisite branches in merge proposals"

I'll file another bug about the merge diff being wrong. For now UDD documentation should tell that

If you are merging from debian, on merge proposal set lp:debian/[sid|squeeze]/package as pre-requisite branch.
If you are packaging a new upstream release or an update to package which is already at ubuntu1 patch no pre-requisite branches required in the merge-proposal.

Changed in launchpad-code:
status: New → Invalid
Changed in udd:
status: New → Confirmed
summary: - Distro package merge proposals need different diffs
+ UDD Docs should discuss pre-requisite branche setting in merge proposals
summary: - UDD Docs should discuss pre-requisite branche setting in merge proposals
+ UDD Docs should discuss pre-requisite branch setting in merge proposals
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

I've updated the docs. Not the best =) but at least more useful. Covers sponsorship process for ubuntu updates & merges from Debian including instructions on all the various debdiffs.

Changed in udd:
status: Confirmed → Fix Released
Revision history for this message
James Westby (james-w) wrote :

Hi Dmitrijs,

Thanks for your efforts on this, but as I said on the mailing lists I think setting
the prerequisite branch is wrong, as it is abusing a possibly useful bit of
information for this use. I would much prefer to fix this on the LP side somehow,
which means we won't hit problems later from abusing the field.

Therefore I'm going to take the note out from the documentation so that new people
don't learn this as the correct way to do it.

Thanks,

James

Changed in udd:
status: Fix Released → Won't Fix
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Subscribing...

Other bug subscribers

Remote bug watches

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