On Fri, May 25, 2012 at 9:10 AM, Holger Levsen <hol...@layer-acht.org> wrote:
...
>
> I'd prefer seperate branches, but oh well...
>
...
>
> ... havent merged 750ea46 and cb204bb as they need 479dc87 which merges rather
> dirty with the other changes merged from Andreas today.
>
> So please rebase and I'll happily merge them then.
>
>

OK, the rebase is available. A fresh piuparts-report run looks clean.

I don't have a good option for avoiding the ugly rebases. Either these
new feature branches need to rebase to develop, or piuparts-server
needs to be rebased to the new develop HEAD as they are added. Neither
has been pleasant lately. The process will be cleaned up when the
ht_root stuff is either merged or rejected (piuparts-report.py is the
new README.txt). What can I do to help grease the skids on merging
packaging?

I've also pulled forward leftover-dir (#672769).



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to