Simetrical schreef:
We have multiple big branch merges waiting around right now (e.g., rev_deleted, API edit, . . .).
Well ApiEdit_Vodafone is far from ready, and will be a small merge. My initial APIedit branch has been merged already.
One branch merge did sneak in a couple of months ago by merging one or two files at a time, but that was a very modular thing where the changes in different files weren't really related (basically separating some backend logic out from the interface logic).
Do you mean my refactoring of API modules and some core backend functions? That wasn't even a branch merge, I just wrote, tested and committed those refactorings one at a time.
Anyway, something that touches as deep upon the core code as Namespace Manager does should be in its own branch IMO. The perceived problem with branches is nonexistent if there's someone around to svnmerge every week or so and resolve conflicts. Sadly, a lot of branches appear to be unmaintained.
Roan Kattouw (Catrope)