On Jun 1, 2012, at 3:01 PM, Axel Liljencrantz wrote:
> 2012/6/1 Jan Kanis <jan.c...@jankanis.nl>
>
> * Who, if anybody has been maintaining the non-fishfish fish codebase?
> * Does that person (if s/he exists) have any problem with making fishfish the
> default feature branch of fish?
>
> There hasn't been any official structure in who are considered maintainers.
> People who've had code to commit and requested it have access to the
> repository at gitorious.org/fish-shell, and most of them are on this list.
> The list of people with commit access is at
> http://gitorious.org/+fish-shell-developers/memberships
>
> I haven't had time yet to check out fishfish, but it's great to see the
> effort. Being one of the committers, I think it's great to make/merge it into
> the default branch.
>
> Cool to see so many contributors.
>
> From my playing around with ridiculousfishfish, is seems like it has some
> very cool new code in, but is still a bit rough around the edges. It is,
> after all labeled as beta. One option might be to christen it the official
> development branch of fish and then once it's stabilized make it into the new
> master branch.
>
> Biggest annoyance with that plan is that because of the c=>cpp renaming, even
> trivial bug fix patches won't be possible to simply cherry pich from one
> branch to the other, so shortening the stabilization period as much as
> humanly possible would be highly advantageous in order to not split the
> development effort.
A short stabilization period sounds good, but there ought to be no need to
cherry-pick at all. The file renaming was done through git, which is smart
enough to apply patches to files under their new name. Any changes to master
can simply be merged to fish_fish like any other branch.
By the same token, fish_fish can be cleanly merged to master as well. That's
how I'd suggest incorporating my changes: we'll just do an ordinary merge
request.
_fish
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fish-users mailing list
Fish-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fish-users
