[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#592055: xpdf: freeze exception



Hi,

On Sat, Aug 07, 2010 at 07:23:26PM +0100, Neil McGovern wrote:
> Now I'm kinda confused. 3.02-9 is in freeze-exceptions and will be
> entering testing shortly. Additionally, the patch provided by Michael
> Gilbert seems fine.

Thanks.

I see "Ignoring block request by freeze, due to unblock request by
freeze-exception".
 
> However, the large diff as produced on the git repo won't be ok.

I should have posted to BUG list.... 

$ git diff -r osamu/debian/3.02-9..master|diffstat|tail -1
 23 files changed, 214 insertions(+), 186 deletions(-)

The tag for actual 3.02-9 release was osamu/debian/3.02-9.

This was because I had to follow:
 * Michael's direction not to change/rebase existing git repo 
   contents/history.
 * Michael only had debian directory content in this git repo.
 * I had normal full source + pristine tar locally in my git
   which I created to review for sponsoring.
 * Michael asked me to commit over existing repo.
 * I renamed local debian/3.02-9 to osamu/debian/3.02-9 and committed.

> Does that make more sense?

I hope now it makes sense to you.  Thank you for your patience.

I also hope that Michael agrees that git repo should not be a simple
unmanaged commit history but something for people to review changes in
meaningful way.  If trying something, we should use topic branch.  main
should be kept clean by merging only clean history.  I think bad broken
commits to a small exposure git repo like xpdf can be rebased to ease
future review after mail exchanges among users.

Osamu




Reply to: