Ticket #2 (using Trac)
Opened 2 years ago
Last modified 2 years ago
branching
Status: new
| Reported by: | grahack | Assigned to: | |
|---|---|---|---|
| Priority: | trivial | Milestone: | not applicable |
| Component: | none | Version: | |
| Keywords: | branch | Cc: | |
Let's take all the benefits of our versioning system. In this ticket we could try to think about all the branches that we could create.
One per developper? One per task (html validation, ACL, i18n...)? Both?
Change History
04/06/07 13:51:19: Modified by Ixiaus
04/09/07 04:53:53: Modified by grahack
No, a separate directory beside the one for FreakAuth in the root (like we already did actually, but this is just the answer).
Anytime that one of us will want to go in a way and not bothering others (see svn book), we'll discuss to decide anyway. But I just wanted to know if you had some ideas about that.
04/09/07 18:15:26: Modified by danfreak
Well I think that at this point we should decide a common branching strategy in order to don't overwrite our changes if we are working on the same file simultaneulsy! ...I'm reading the docs and I'll suggest my viewpoint on this shortly...
04/10/07 02:44:49: Modified by grahack
- version deleted.
We won't overwrite our changes, svn is here for that.
If someone worked on a file that you changed too, svn will ask you to update it in order to retrieve ones changes. Then there could be conflicts or not... (see this).
Branches are cool when a big change is wanted, but when it's not sure whether to keep it or not.
For example, I could do a branch to move countries in the lang file, so I can commit my work here (I'll need several commits, not very clear if I do it just in one). When I'm done, I can svn merge my changes to the trunk.
See the book (this link is better thatn the previous one):
Whenever someone needs to make a long-running change that is likely to disrupt the trunk, a standard procedure is to create a private branch and commit changes there until all the work is complete.
05/07/07 09:43:19: Modified by grahack
- priority changed from major to trivial.
- keywords set to branch.
- milestone set to not applicable.

How should we handle Sentinel? Just as a branch?