Confirmed users
508
edits
Mozilla.com/Workflow-improvements: Difference between revisions
Mozilla.com/Workflow-improvements (view source)
Revision as of 17:55, 14 January 2011
, 14 January 2011no edit summary
No edit summary |
|||
| Line 43: | Line 43: | ||
* All developers committing to trunk. I know this is typical for SVN, but it really does make it more confusing than it should be. Developers should be encouraged to commit frequently, but with a global trunk, changes might get clobbered, pulled down, moved around, etc. by accident. It muddles the central repository with possibly very experimental code. | * All developers committing to trunk. I know this is typical for SVN, but it really does make it more confusing than it should be. Developers should be encouraged to commit frequently, but with a global trunk, changes might get clobbered, pulled down, moved around, etc. by accident. It muddles the central repository with possibly very experimental code. | ||
** There are a few bad situations with this. Here's one: | |||
Bob and Tim have updated their repository to the latest revision, r100. | |||
Bob is working on feature A in index.html Tim is working on feature B in index.html | |||
| | | |||
v v | |||
commits partial fix commits bug fix | |||
r101 r102 | |||
| | |||
v | |||
+---------------------------------------pushes out r102 to production | |||
| | |||
v | |||
r101 goes live accidentally | |||
** Possible easy fix: Each developer works on his own SVN branch. This probably wouldn't work though because SVN doesn't track revisions across branches and it would make tracking code extremely confusing. | ** Possible easy fix: Each developer works on his own SVN branch. This probably wouldn't work though because SVN doesn't track revisions across branches and it would make tracking code extremely confusing. | ||