Re: Branch Strategy (was: So, what should we do first?)

2012-01-05 Thread Alex Harui
OK, so to summarize (mainly for me since we did not work this way before): Trunk is where we prep builds for release. It can be broken (but shouldn't be) and isn't the latest released code. Tags will hold branches of Trunk for each release Branches holds other branches of Trunk for more

Re: Branch Strategy (was: So, what should we do first?)

2012-01-05 Thread Omar Gonzalez
On Thu, Jan 5, 2012 at 11:13 AM, Alex Harui aha...@adobe.com wrote: Tags will hold branches of Trunk for each release Yes, we can use tags for several things, a main one being releases. I like the idea of something like -tags -releases -1.0 -1.1 -somethingElseWeMightWantToTag

Re: Branch Strategy (was: So, what should we do first?)

2012-01-05 Thread Jonathan Campos
-Should there still be a Whiteboard or Sandbox folder or is it fine to just create those under Branches? I would still like to see a whiteboard or sandbox for users as defined by Bertrand. See http://svn.apache.org/repos/asf/sling/whiteboard/ for example - there are some folders named after

Re: Branch Strategy (was: So, what should we do first?)

2012-01-05 Thread Jonathan Campos
+1 to what omar said

Re: Branch Strategy (was: So, what should we do first?)

2012-01-05 Thread Rui Silva
Alex, I think BRANCHES would do just fine for all branching needs (not TRUNK and TAGS). Regarding bug fixing that would my suggestion too. Create a sub-branch and fix it there. Later we can decide if the fix warrants a new release of that main version or not. Basically all TAGS branches that

Re: Branch Strategy (was: So, what should we do first?)

2012-01-05 Thread Omar Gonzalez
On Thu, Jan 5, 2012 at 11:26 AM, Rui Silva f...@rduartes.net wrote: Alex, I think BRANCHES would do just fine for all branching needs (not TRUNK and TAGS). Right, so for example to be more clear in how I was envisioning what we're discussing: Here are some tags: -tags -releases