[gentoo-catalyst] culling the catalyst repo branches

[gentoo-catalyst] culling the catalyst repo branches

[Anthony G. Basile]

Hi everyone,

Currently the catalyst git repo at 
http://gitweb.gentoo.org/proj/catalyst.git has the following branches:

   remotes/origin/2.X
   remotes/origin/3.0
   remotes/origin/HEAD -> origin/master
   remotes/origin/catalyst_2
   remotes/origin/catalyst_3
   remotes/origin/master
   remotes/origin/pending
   remotes/origin/rewrite-on-master
   remotes/origin/tar-volume-label

as obtained by `git branch -a`.  This is a bit of a mess.  After 
discussions in freenode/#gentoo-releng, we've come up with the following

2.X - legacy branch.  Releases are coming from this branch but that will 
end soon.
3.0 - development branch for dol-sen only.
master - development branch were we should focus our contributions
catalyst_2 - dead and should be nuked
catalyst_3 - dead and should be nuked
pending - has some development work in it.
write-on-master - no idea
tar-volume-label - no idea

Okay time to do some cleanup.  I want to nuke the catalyst_2 and 
catalyst_3 branches.  dol-sen is going to take care of pending and 3.0.  
I have no idea what write-on-master and tar-volume-label are so my 
feeling is to nuke those too unless someone speaks up and said, wait NO!

Any comments before I act.  I'll wait about a week.

-- 
Anthony G. Basile, Ph.D.
Gentoo Linux Developer [Hardened]
E-Mail    : blueness@gentoo.org
GnuPG FP  : 1FED FAD9 D82C 52A5 3BAB  DC79 9384 FA6E F52D 4BBA
GnuPG ID  : F52D4BBA

Re: [gentoo-catalyst] culling the catalyst repo branches

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

On 05 Oct 2015 22:25, Anthony G. Basile wrote:
> Okay time to do some cleanup.  I want to nuke the catalyst_2 and 
> catalyst_3 branches.  dol-sen is going to take care of pending and 3.0.  
> I have no idea what write-on-master and tar-volume-label are so my 
> feeling is to nuke those too unless someone speaks up and said, wait NO!

rather than delete branches (and thus history), how about we move them to
a "old/" or "dead/" namespace ?  then it'd be:
	refs/heads/
	|-- 2.x
	|-- 3.0
	|-- master
	`-- old
	    |-- catalyst_2
	    |-- catalyst_3
	    |-- rewrite-on-master
		`-- tar-volume-label
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-catalyst] culling the catalyst repo branches

[Anthony G. Basile]

On 10/5/15 10:36 PM, Mike Frysinger wrote:
> On 05 Oct 2015 22:25, Anthony G. Basile wrote:
>> Okay time to do some cleanup.  I want to nuke the catalyst_2 and
>> catalyst_3 branches.  dol-sen is going to take care of pending and 3.0.
>> I have no idea what write-on-master and tar-volume-label are so my
>> feeling is to nuke those too unless someone speaks up and said, wait NO!
> rather than delete branches (and thus history), how about we move them to
> a "old/" or "dead/" namespace ?  then it'd be:
> 	refs/heads/
> 	|-- 2.x
> 	|-- 3.0
> 	|-- master
> 	`-- old
> 	    |-- catalyst_2
> 	    |-- catalyst_3
> 	    |-- rewrite-on-master
> 		`-- tar-volume-label
> -mike

yeah even better, except i'm not sure how to do nested branches like 
that.  i'll google it.

-- 
Anthony G. Basile, Ph.D.
Gentoo Linux Developer [Hardened]
E-Mail    : blueness@gentoo.org
GnuPG FP  : 1FED FAD9 D82C 52A5 3BAB  DC79 9384 FA6E F52D 4BBA
GnuPG ID  : F52D4BBA

Re: [gentoo-catalyst] culling the catalyst repo branches

[Anthony G. Basile]

On 10/5/15 10:46 PM, Anthony G. Basile wrote:
> On 10/5/15 10:36 PM, Mike Frysinger wrote:
>> On 05 Oct 2015 22:25, Anthony G. Basile wrote:
>>> Okay time to do some cleanup.  I want to nuke the catalyst_2 and
>>> catalyst_3 branches.  dol-sen is going to take care of pending and 3.0.
>>> I have no idea what write-on-master and tar-volume-label are so my
>>> feeling is to nuke those too unless someone speaks up and said, wait 
>>> NO!
>> rather than delete branches (and thus history), how about we move 
>> them to
>> a "old/" or "dead/" namespace ?  then it'd be:
>>     refs/heads/
>>     |-- 2.x
>>     |-- 3.0
>>     |-- master
>>     `-- old
>>         |-- catalyst_2
>>         |-- catalyst_3
>>         |-- rewrite-on-master
>>         `-- tar-volume-label
>> -mike
>
> yeah even better, except i'm not sure how to do nested branches like 
> that.  i'll google it.
>
Okay its pretty easy.  I'm not going to use gitnamespaces(7) but just 
copy the branches to branches named old/catalyst_2 etc which will give 
the above structure.  This will keep the history but the branches will 
show up as "old/catalyst_2" on gitweb.g.o under branch.

-- 
Anthony G. Basile, Ph.D.
Gentoo Linux Developer [Hardened]
E-Mail    : blueness@gentoo.org
GnuPG FP  : 1FED FAD9 D82C 52A5 3BAB  DC79 9384 FA6E F52D 4BBA
GnuPG ID  : F52D4BBA

Re: [gentoo-catalyst] culling the catalyst repo branches

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1302 bytes --]

On 05 Oct 2015 22:46, Anthony G. Basile wrote:
> On 10/5/15 10:36 PM, Mike Frysinger wrote:
> > On 05 Oct 2015 22:25, Anthony G. Basile wrote:
> >> Okay time to do some cleanup.  I want to nuke the catalyst_2 and
> >> catalyst_3 branches.  dol-sen is going to take care of pending and 3.0.
> >> I have no idea what write-on-master and tar-volume-label are so my
> >> feeling is to nuke those too unless someone speaks up and said, wait NO!
> > rather than delete branches (and thus history), how about we move them to
> > a "old/" or "dead/" namespace ?  then it'd be:
> > 	refs/heads/
> > 	|-- 2.x
> > 	|-- 3.0
> > 	|-- master
> > 	`-- old
> > 	    |-- catalyst_2
> > 	    |-- catalyst_3
> > 	    |-- rewrite-on-master
> > 		`-- tar-volume-label
> 
> yeah even better, except i'm not sure how to do nested branches like 
> that.  i'll google it.

that part is simple :).  there's nothing special with refs.

create a copy first:
$ git push origin -n remotes/origin/catalyst_2:refs/heads/old/catalyst_2
To git+ssh://git@git.gentoo.org/proj/catalyst.git
 * [new branch]      origin/catalyst_2 -> old/catalyst_2

then delete the old one:
$ git push origin -n :refs/heads/catalyst_2
To git+ssh://git@git.gentoo.org/proj/catalyst.git
 - [deleted]         catalyst_2
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-catalyst] culling the catalyst repo branches

[Anthony G. Basile]

On 10/5/15 11:19 PM, Mike Frysinger wrote:
> On 05 Oct 2015 22:46, Anthony G. Basile wrote:
>> On 10/5/15 10:36 PM, Mike Frysinger wrote:
>>> On 05 Oct 2015 22:25, Anthony G. Basile wrote:
>>>> Okay time to do some cleanup.  I want to nuke the catalyst_2 and
>>>> catalyst_3 branches.  dol-sen is going to take care of pending and 3.0.
>>>> I have no idea what write-on-master and tar-volume-label are so my
>>>> feeling is to nuke those too unless someone speaks up and said, wait NO!
>>> rather than delete branches (and thus history), how about we move them to
>>> a "old/" or "dead/" namespace ?  then it'd be:
>>> 	refs/heads/
>>> 	|-- 2.x
>>> 	|-- 3.0
>>> 	|-- master
>>> 	`-- old
>>> 	    |-- catalyst_2
>>> 	    |-- catalyst_3
>>> 	    |-- rewrite-on-master
>>> 		`-- tar-volume-label
>> yeah even better, except i'm not sure how to do nested branches like
>> that.  i'll google it.
> that part is simple :).  there's nothing special with refs.
>
> create a copy first:
> $ git push origin -n remotes/origin/catalyst_2:refs/heads/old/catalyst_2
> To git+ssh://git@git.gentoo.org/proj/catalyst.git
>   * [new branch]      origin/catalyst_2 -> old/catalyst_2
>
> then delete the old one:
> $ git push origin -n :refs/heads/catalyst_2
> To git+ssh://git@git.gentoo.org/proj/catalyst.git
>   - [deleted]         catalyst_2
> -mike

All done.

-- 
Anthony G. Basile, Ph.D.
Gentoo Linux Developer [Hardened]
E-Mail    : blueness@gentoo.org
GnuPG FP  : 1FED FAD9 D82C 52A5 3BAB  DC79 9384 FA6E F52D 4BBA
GnuPG ID  : F52D4BBA