Lars Gullik Bj?nnes wrote: > You, the lyx developers, have to agree on process, but the git repo > has been open for writing since sunday evening.
>From what I see there are roughly 3 kinds of things committed into trunk as far as time and testing is concerned 1. Short-time one shots, e.g. fixing small glitches, doc changes, translations. Sometimes can take few minutes to produce and once committed there is no need to even remember that ever touch it. 2. Medium-time, e.g. ordinary bug fixing, in the order of hours/few days, sometimes needs following commits. 3. Long-time goals, e.g. new-features, refactoring some aspect of the code, in the range of weeks or days. 1 & 2: Looking at the recent commit history shows that most of trunk movement consists of 1 & 2 and I don't see much point for any feature-branch business -- no matter whether technical solution is just another branch I would like to see place where things can be pushed without practicing git cloning/branching/merging, or even some later signaling that 'fixing typo in PrefDocument.ui can be really merged now'. If maintainer is pleased there can still be some separate stable tree where things go merged once a day/week, but its his burden to take care of it or about potential merge conflicts. I see that in some cases of 2. additional commit are applied but we shouldn't value clean commit history at such high rates. 3: Each feature has its own branch and if maintainer is pleased he can create the whole cascade of stabilizing steps via merging. Vincent's proposal applies here. I don't see we have enough testing power to afford two (more&less stable) trunks, but no hard opinion about experimenting with it. For sure no such distinction should be in 2.0.x branch. Last but not least: For devs starting with git, there could be created with wiki page showing the usual git-command workflow for these three typical cases and letting them to join development process again and without reading books about git unless they are pleased. Pavel BTW Lars, can we get wiki and web working again? Christian stop to respond altogether..
