On Wednesday, December 19, 2012 02:02:58 PM Emmet Hikory wrote: > Scott Kitterman wrote: > > On Wednesday, December 19, 2012 01:02:21 PM Emmet Hikory wrote: > > > Is it not the case that if one prefers UDD, one can just pull the > > > > > > current Debian import from launchpad, apply the diff proposed by the > > > candidate, run debcommit, and end up with a branch with all the same > > > characteristics as if a branch had been submitted for merging? > > > Similarly, > > > is it not the case that if someone submits a branch, one can ask > > > launchpad > > > to generate the diff, and use that as the merge artifact in a non-UDD > > > workflow? > > > > With respect to the last point, similar to your description of your work > > flow, I want to see the packaging diff including the Debian -> Debian > > packaging diff, the Ubuntu --> Ubuntu packaging diff and the Debian > > old/new -- Ubuntu old/new packaging diffs to ensure no Ubuntu changes > > have been inadvertently lost, the remaining changes are both needed and > > documents, and the changes from Debian are correctly applied. i end up > > needing then the old Debian and Ubuntu packages as well as the new Debian > > package and the proposed merged. There's probably some reasonable way > > for me to extract all that from some relevant branches somewhere, but to > > me it's far easier to use grab-merge and a debdiff. > Do the diffs launchpad produces from UDD merge branches not work as an > input diff with grab-merge? I've never tried for this specific type of > merge, but in cases where it was just a patch being applied to an existing > Ubuntu package, I had success pulling diffs from LP to apply.
It's been some time since I tried this, so i don't recall. I don't see how it can beat grab-merge $PACKAGE and an appropriate packaging diff in a bug for simplicity. When I use grab-merge there's everything I need sitting there is a directory ready for me to use. No hunting for diffs or branches needed. Scott K -- ubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
