[Pkg-octave-devel] Restoring branches on octave-symbolic :-(

[Thomas Weber]

On Tue, Jan 04, 2011 at 04:26:02PM -0600, Jordi Gutiérrez Hermoso wrote:
> > Release-managers will *never* accept such a change so late in the
> > release cycle.
> 
> I asked around in IRC and they said it was still possible to get the
> package back into squeeze if I had an unstable upload.

Yes, but not with so many changes in the packaging.

> Anyways, the change doesn't change the actual package itself too much,
> the debian/ directory. It's just a packaging convenience. You think
> they'll still be adverse to it?

Uh, yes. They look at the debdiff, usually.

> > Anyway, which of the four patches from SVN actually fixes the crash?
> 
> Probably the one the last two that patche the C++ sources, but I'm
> unable to understand why it would work. The UB I was observing earlier
> didn't happen around that code. Do you think we should just roll those
> two into one and drop the other two patches?

Okay, how should we proceed? I think the best way forward is as follows: 

1) Save the current git repository on alioth to some external space, so
we do not loose your work.
2) Rebase the repository to the state before you commit. 
3) Check which patch actually fixed the problem. I think it's just the
call to symbols() in PKG_ADD. 
4) Upload a package which just that minimal patch, using the old
layout. That way, the debdiff stays small.
5) Re-apply your changes to the repository layout.

Suggestions?

	Thomas