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

[Ximin Luo]

On 16/11/15 18:21, Holger Levsen wrote:
> Hi,
> 
> Ximin, did you look at these urls? ;) Do! ;)
> 

I've looked through them now, but I haven't read through the bug reports or previous discussion, so I don't understand the significance of those urls... could you explain? Or not, if you don't have time. I will eventually read through everything and maybe understand it by myself.

> On Montag, 16. November 2015, Ximin Luo wrote:
>> But what's the point of this - are we really going to maintain separate
>> lines of development like this? 
> 
> for points in time, sure, why not?
> 
>> 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.
> 
> branches are tags are commits.
> 

Well, you commit on top of branches, in a way that forks away from anything else that might have been commited on top of that branch's commit, which makes the history more complex. (Sorry complex sentence :()

Applied to the current situation, I am basically asking "do we expect to (a) keep 0.2.1-1 in sid and make fixes to it to release 0.2.1-2, or (b) our next upload be 0.2.2-1?" If (b) then having one single debian/sid branch would be easier.

>> Can I just reset debian/sid to a4a98663 ("Merge tag 'debian/0.2.2-1' into
>> debian/experimental") and delete the debian/experimental branch?
> 
> please keep the sid branch for now and also please let's keep 0.2.1 in sid, 
> that why it might be easier to convince the RMs to get 0.2.1 into jessie too.
> 

OK. I am not sure why it will be easier to convince RMs to put 0.2.1 into jessie, than 0.2.2, but if you think so then sure. I haven't looked at either in too much detail yet.

X

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