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

[Jordi Gutiérrez Hermoso]

On 4 January 2011 15:24, Thomas Weber <tweber at debian.org> wrote:
> On Mon, Jan 03, 2011 at 07:59:22PM -0600, Jordi Gutiérrez Hermoso wrote:
>> On 3 January 2011 13:39, Thomas Weber <tweber at debian.org> wrote:
>> > On Sun, Jan 02, 2011 at 10:28:36PM -0600, Jordi Gutiérrez Hermoso wrote:
>> >> I carelessly did "git push --mirror" in the octave-symbolic repo, and
>> >> I thought all it would do was push all of my branches. Unfortunately,
>> >> it also removed all of the branches I hadn't clone locally. Does
>> >> someone have them and is able to push them?
>> >
>> > I don't think the octave-symbolic repo had any branches other than
>> > 'master'.
>>
>> It had a branch for each release. They sort of are still there,
>> somewhere in the reflog, I think. But whatever, I guess they're not a
>> big deal, just there for historicity purposes.
>
> Okay, I just updated. What we have now is the complete upstream source
> code. I'm going to remove this now.

Wait, wait, why?

I worked hard to get the upstream source into the package. It's much
nicer to work that way. Notice it's in its own separate branch. That
way we can just do

     git clone git+ssh://git.debian.org/git/pkg-octave/octave-foo.git

         # ...
         # hack hack hack
         # ...

     git-buildpackage

instead of having to do what you described back here:

2010/3/21 Thomas Weber <thomas.weber.mail at gmail.com>:
> On Sun, Mar 21, 2010 at 01:24:03PM -0600, Jordi Gutiérrez Hermoso wrote:

>> I'm looking at git-buildpackage for managing packages under git
>> control, but before I mess with your own setup, can you explain, how
>> do you usually manage things?
>
> My normal workflow for updating in Debian:
> 1) dget -x URL-TO-DSC
> 2) rm -rf debian/
> 3) cp -r GIT-DIRECTORY/debian
> 4) cp -r GIT-DIRECTORY/.git*
> start working
>
> For updates, 1) and 2) are left out and I extract the tarball.

And we can even mirror the svn history or new tarball releases with
ease. You don't prefer it this way? Bonus: the packaging is explicitly
tied to what is being packaged.

Back to the status the git repo in Alioth for octave-symbolic, I was
able to recover the missing branches, for old releases. I think I'm
able to fix this now on my own. It's just a few tags (git branches)
that are missing.

And this should close #607071. I think I'll need your intervention
with the release managers in order to request a freeze exception in
order to get octave-symbolic back into squeeze, at least having an
upload ready.

- Jordi G. H.