Workflow with quilt patches & pipeline
Dmitrijs Ledkovs
dmitrij.ledkov at gmail.com
Mon Dec 21 11:23:35 GMT 2009
2009/12/21 James Westby <jw+debian at jameswestby.net>:
>
> Hi,
>
> Interesting idea.
>
> Does pump-patches take debian/patches and apply them in term as pipes?
>
> You are right that this does look quite simple. My concern is that it is
> using patches as the interchange format for bzr. This makes things like
> merging suboptimal, as you don't get the full power of the VCS. Maybe
> there's a subtelty I am missing though.
>
> Have you seen https://wiki.ubuntu.com/NoMoreSourcePackages which
> proposes something similar?
>
Yeap I did see it.
NoMoreSourcePackage is the next step when we gonna have all branches
imported without hickups and soyuz can build branches.
My current proposal is the in-betweenie. How to work with
lp:ubuntu/package branches now without using quilt push/refresh. Cause
i don't like quilt at all =)
I really can't wait for merges to be no different from syncs Eg.
revert the ubuntu changes, merge debian branch, push. (sync done).
I'm following the discussion on looms vs pipelines for *the* way to
patch upstream branch and so far for my personal use (as a Debian
maintainer) I'm gonna use throw-away pipes into patches.
But this framework can be extended bzr merge-directive with patch is
still a valid quilt patch ;-)
And I don't believe you loosing much of bzr goodness.
* pump-patches
* switch to upstream pipe
* import new upstream version
* pump new upstream
* update all the patchy pipes
* regenerate patches.
--
With best regards
Dmitrijs Ledkovs (for short Dima),
Ледков Дмитрий Юрьевич
() ascii ribbon campaign - against html e-mail
/\ www.asciiribbon.org - against proprietary attachments
More information about the ubuntu-distributed-devel
mailing list