On Thu, 23 Feb 2012 18:42:46 +0100
Kristian Amlie <kristian@xxxxxxxxxx> wrote:
On 02/23/12 03:19, jimmy wrote:
I looked at the changes between 0.060 and 0.062 the last few days. There
are huge divergence in the 2 branches. The diff-file is about 1 MB. There
is definitely no possibility of automatic merging, for sure.
...
I don't really know which one is to be kept. The changes in the 0.062
UI/*.fl files are huge, too.
Can anyone tell me which of the above are to be kept, which to be removed?
Once I know that, I can try to help with some merging.
I think I would attack this from the angle of "what works best". Since
nobody knows the code very well anymore, I think there would be little
point in merging a new branch that introduces many bugs.
I don't know in what state Cal was in his coding, whether it was in the
middle of restructuring, or almost finished (does anyone know?), but I
think regardless I would put 0.062 through a lot of testing and choose
that branch only if it has no regressions. Or at least very few.
Otherwise we will just find ourselves with noone to fix them.