Before replying to the specific branch questions, let me note that a
while ago we talked about prefixing branches that we most likely have no
use for with "zzz-" or a similar prefix that stops confusion about their
status. For those branches that we do not remove immediately, I still
like this idea. I like "zzz" as a prefix because it both sorts the
branches to the end of the branch list and can be read as "this branch
I do however think that some branches need removal. Otherwise we are
going to build up a list of useless branches that nobody will look at
Another thing that we should make a discussion about is branch
naming in general. As of now, everybody uses his own preference,
resulting in the branch list looking fairly cluttered and the branch
names being of rather minor informational value.
Now for the specific branches mentioned.
On Fri, Aug 12, 2016 at 04:31:53AM +0000, datahead wrote:
The following branches, to my knowledge are obsolete and need to be
deleted. If no one objects, I will probably eventually delete these:
* MirrorFixAttempt - Attempt at fixing level editor icon rotation issue, which Quintus
* MirrorOpenGLTry - Another attempt at the level editor icon rotation issue
* MouseVisibilityReverion - Another attempt at the level editor icon rotation issue (the
mouse visibility issue was related)
* sfml-port-speedfactor-fix-HACKED - Hacked attempt at fixing speed factor issues in
first SFML port / actor-scene model implementation
* sfml-speedfactor-fix - Attempt at fixing speed factor issues in
first SFML port / actor-scene model - superceded by branch
I agree with you; all of these can be removed because the causes they
were created for have been resolved or have become meaningless.
We should probably keep one branch from the attempt at the
actor/scene model. A good choice might be:
If you want to keep it, then we can do that. It should however be
renamed since the association the current name invokes does not resemble
why we kept it. What about renaming it to "zzz-actormodel-attempt"?
I would like to keep this one somewhere, since it had an attempt at
fixing the "true" root cause for flickering issues with pipe lines:
Since the problem is not resolved, the branch should be kept.
I recently closed the corresponding ticket on the tracker with
the remark that if any further development is intended, it can be
reopened. I would suggest to rename them with a "zzz-" prefix for now
and keep them. However, since this is specifically Brian's code it is
unlikely we can do something with it. Brian should fork the repository
and keep this code in his own repository ideally. I suggest we drop him
an email and ask him to do exactly that if he wants to keep the code. We
cannot keep code of unmerged PRs around forever.
This branch has been merged with commit
4cc405df30c6db2bff4ce4ede165731ca05bf830. It can be removed as its code
meanwhile has made its way to devel.
This branch contains Luiji's first attempt on upgrading our CEGUI
dependency to 0.8.x. When I did the upgrade recently, I did not base my
changes on this branch. It has been obsoleted by my approach, and can
thus be removed.
A search on the tracker reveals that this branch is work of xet7. We
have to ask him what he intended to do with it.
I remember these ones were being worked on:
* feature-packages-physfs - I remember Brian was working on this. We
should keep it unless and until we know it is permanently abandoned
(never to be implemented, ever).
Like with the vanderburg_player_imgset branch, I closed the
corresponding ticket in the same way as indicated above. And
likewise, I suggest to do a "zzz-" rename and email Brian.
* multiple-overworld-exits - This is something we might consider
finishing in a near-future-release in the old code base.
I remember starting this branch, but I actually don't know anymore how
much I worked there and in what state it is. It is likely that due to
the fairly heavy development efforts recently its content is obsolete. I
need to check it again.
Demos - I think these should be kept, too - We could consider moving
them somewhere else on the server if desired:
* world_animation - old demo by Brian
Put a "zzz-" prefix here and keep it. It might prove useful some time.
* xml_performance - recent demo by Quintus, for architecture
This branch is for discussion related to ticket #534 since it was
suggested to replace our use of XML with Protocol Buffers. Since that
discussion is appearently not yet finished, the branch should stick
around, though I need to update it with the infamous Get_Pointer()
optimisation so it yields more meaningful results.
PGP/GPG ID: F1D8799FBCC8BC4F