Hi, rebasing to HEAD is simple; if you are up-to-date, 'git-rebase origin' should re-apply your patches against the origin (the main pbuilder tree), so that your changes will stand out.
At Mon, 11 Aug 2008 02:08:35 +0900, Osamu Aoki wrote: > > Hi, > > I had impression that sending git formatted mail is easier for merging > in branch... I guess not. > > On Tue, Aug 05, 2008 at 11:37:24AM +0900, Junichi Uekawa wrote: > > Hi, > > > > It's quite hard to review your patch this way; what's the cumulative > > diff against HEAD? > > No it started at debian/0.181 tag. > > > I've added you to the pbuilder group on alioth; however I am worried > > that your patch may be adding too much complexity to pbuilder > > codebase. If I incorporate this patch to pbuilder, I'd like to do the > > same for cowbuilder, and I want to keep the implementation as clean as > > possible. > > I see your point. > > Aside from documentation updates, this is relatively simple patch. > The core of code change was: > > pbuilder | 11 +++++ > pbuilder-loadconfig | 18 ++++---- > pbuilder-loadconfig-classic | 26 +++++++++++ > pbuilder-loadconfig-new | 37 +++++++++++++++ > pbuilder-modules | 105 +++++++++++++++++++++++++++++++++++++++--- > > * pbuilder: > * patched to accepts --mode option and pass it as $PBMODEOPTION > * pbuilder-loadconfig: > * Old contents are moved to pbuilder-loadconfig-classic > * Now this switches between pbuilder-loadconfig-classic and > pbuilder-loadconfig-new based on use of --mode option. > * pbuilder-loadconfig-new uses configuration file in different > locations based on --mode option. > * pbuilder-modules: > * Old "function installaptlines" is moved to "function > installaptlines_classic". > * Now "function installaptlines" switches between "function > installaptlines_classic" and "function installaptlines_new" > * "function installaptlines_new" does data driven apt setup based on > --mode option. > * mode/*: > default data for apt setup under --mode option usage > > I kept 100% compatibility if --mode option is not used. (Although it is > not so pretty). > > As for cowdancer, it looks to me very straight forward to add --mode > option and pass that to pbuilder. > > Anyway I will make new branch from current HEAD for easy review later. > > Osamu > -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
