[Pkg-privacy-maintainers] torbrowser-launcher: last upload vs. Git history

[Ximin Luo]

On 16/11/15 17:37, Holger Levsen wrote:
> current TODO for this:
> * test packages from bpo too, maybe just weekly
> * tee tbl-l output and grep for "Download error: Download Error: 404 Not Found" and fail earlier
> * not sure how to test updates. maybe just run in yesterdays schroot before upgrading
> * test with python-pygame installed too?
> * run this in qemu and enable apparmor too?
> * debug why iceweasel is needed to be installed…
> * notifications to somewhere public
> 
> I'll make sure to keep this tests in a meaningful state so that in future we
> know early when things break.
> 

OK, we currently have separate debian/experimental and debian/sid branches, and the git history is a little complex, but not too bad once you look at it for a few minutes. 

But what's the point of this - are we really going to maintain separate lines of development like this? I'd suggest reducing it to one debian/sid branch, and make "experimental" releases out of this branch as well. We already have tags to point to the actual releases.

Can I just reset debian/sid to a4a98663 ("Merge tag 'debian/0.2.2-1' into debian/experimental") and delete the debian/experimental branch?

X

P.S. I also hard-reset the master branch to upstream's actual master branch. Before the reset, it was on some fork completely separated from the main history, which had Holger as the committer for about 50 commits, I'm guessing as a result of a faulty rebase.

-- 
GPG: 4096R/1318EFAC5FBBDBCE
git://github.com/infinity0/pubkeys.git