Hello Niko, On Thu, Nov 20, 2008 at 10:24:55AM +0200, Niko Tyni wrote: > Package: topgit > Version: 0.5-1 > Severity: normal > Tags: patch > > The new 'tg-export' debian/rules target can create a misordered quilt > series file because the branch dependencies aren't taken into account. > > The attached patch fixes this for me, please have a look. > > Thanks for your work on topgit, > -- > Niko Tyni [email protected]
> >>From 508a5ebf43bf01810e514856f90051b520855d23 Mon Sep 17 00:00:00 2001 > From: Niko Tyni <[email protected]> > Date: Thu, 20 Nov 2008 10:12:13 +0200 > Subject: [PATCH] Use the topological order when exporting explicitly listed > branches. > > When exporting explicitly listed branches (tg export -b), the branch > dependencies were not taken into account. > --- > tg-export.sh | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tg-export.sh b/tg-export.sh > index 52af88d..037b991 100644 > --- a/tg-export.sh > +++ b/tg-export.sh > @@ -181,9 +181,9 @@ if [ -z "$branches" ]; then > recurse_deps driver "$name" > (_ret=0; _dep="$name"; _name=""; _dep_is_tgish=1; driver) > else > - echo "$branches" | tr ',' '\n' | while read _dep; do > - _dep_is_tgish=1 > - $driver > + echo "$branches" | tr ',' '\n' | while read name; do > + recurse_deps driver "$name" > + (_ret=0; _dep="$name"; _name=""; _dep_is_tgish=1; driver) > done > name="$(echo "$branches" | sed 's/.*,//')" > fi Hhhmm, I don't see at once a better way, but there is something I don't like: Consider the following patch dependency graph: base --- patch1 --- patch2 \ \ patch3 Now doing $ tg export -b patch2,patch3 --quilt I get patch1 twice in the series. (Note I didn't try your patch, so my comment is subject to a possible misunderstanding on my side.) Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
