1 files changed, 60 insertions, 0 deletions
diff --git a/Dev/trunk_vs_branch.txt b/Dev/trunk_vs_branch.txt
new file mode 100644
index 000000000..750f239a9
--- /dev/null
+++ b/Dev/trunk_vs_branch.txt
@@ -0,0 +1,60 @@
+- This is a small summary of the roles of trunk vs a branch, as well as their
+  current state in eA. 
+
+- Trunk: This should be the base source-codebase, well all the flashy lights
+  and new enhacements get added. It gets updated a lot, breaks often.
+
+- Current situation: Noone works on trunk anymore and it's seriously outdated.
+
+
+- Branch: This should be a snapshot of the trunk at some given time, and
+  receives no enhancements at all, only bug fixes. Once the branch becomes
+  stable enough, it is "released" to the public with an appropiate version
+  number, and the next branch is created from a new snapshot from the trunk.
+
+- Current situation: Everyone is working on branches/stable s if it were a
+  stable + development source.
+
+As Akaru has pointed out, we need to sort this out inmediately:
+- branches/stable must be moved and become the new trunk/
+- We should probably make a branch snapshot from a few days ago (before the
+  latest feature additions like string permanent variables?) for next release
+  base.
+- All devs should stick to the roles of branch/trunk.
+- It appears most devs who have heard of this agree with Akaru, however the
+  initial steps to clean up the SVN repository have yet to be taken. This task
+  seems assigned to Kayla, maintainer of said repository.
+
+Post your thoughts/ideas about here...
+- [Skotlex] I think fixing skills counts as bug fixing, and goes to branch.
+  But implementing missing skills should go to trunk.
+
+- [Vicious Pucca]
+* Have you read this? http://eathena.ws/board/index.php?showtopic=65827
+At least one of dev seems to agree with me(on irc) that we don't have enough resources(on devs or testers) to do trunk/stable.
+simply.
+1. who's going to test trunk? if no one is gonna test it, and bugs slips into stable... what's the point. good example would be whole guild cache. i'm sure it worked fine on kevin's setting. but when lots of people tested, in various settings, we found out how broke it was.
+2. who's gonna manage trunk->stable transfer? and when? as you know, there always will be some bug... it's like whole eA 1.0 thing. There is always something to fix. It was never quite "stable" enough to do "stable" release. so trunk is gonna be our current stable branch, except even more broken... great. :o
+imo, eA is fine as is.
+and if you REALLY want to dev, should be 3 branches.
+dev: where you commit things. broken often. do-whatever-dev-wants
+trunk/"testing": things that are "complete," but needs testing. primary bug fixes
+stable: the release. should be almost no bugs. shouldn't need update, unless it's critical update.
+
+- [Lance] Now who's in charge of merging back fixes from the stable -> trunk and vise versa
+
+- [Skotlex] From what I heard Akaru explain, after there's a release, the next
+  stage should be merging all the bugfixes that went into stable to trunk.
+  There's no viceversa since the bug fixes in trunk are for features in trunk
+  itself that haven't gone into the branch yet. So to answer yer question,
+  everyone who codes would be in charge. :X
+
+- [Kayla] I was speaking with Devi, do we have the OK from Mass to do this? If so we should reset to
+  revision 0, wipe the trunk, dump stable into the trunk and toss the Preview Release inside of Stable 
+  (or youngest version). 
+
+- [Vicious_Pucca] We should talk about this in dev forum.=p
+Anyway, if this trunk/stable DOES happen, it should happen AFTER TK/SL/SG are DONE-done. really, no half-assed classes please. :o (well, more like 3/4-assed classes right now)
+Another thing. how would DB/NPC update would work? let's say, new npc that are missing, such as Swordie class quest. Is it required? no. Is it official? yes. Is it a bug? not really. Is it a feature? to some, appearantly is... so. what about that?
+and fixes for stable means probably fixes for trunk as well. :o
+If trunk/stable happens, i'm breaking trunk so bad. XD
+\ No newline at end of file