In search of a single SVN Update/Commit/Merge diagram

[Jonathan Anderson]

Many diagrams show the Update/Commit process and others the Merge process but few seem to capture both.  The attached image "SVN_merge.png" from the website https://www.clear.rice.edu/comp310/Eclipse/Subclipse/subversion.html is one of the better examples I found.  With only a foggy understanding of SVN I've ventured to draw my own diagram that attempts to show both Update/Commit and Merge with other nuances.  The attached files named  "SvnSimpleEditFile" (.pptx and .png) cover the lone developer case and files named "SvnEditFileOnBranch" (.pptx and .png) cover multiple developers merging changes back to the trunk.  The third layer I've added to the bottom (Editor / App) shows a more familiar process (open/edit/save) whose pattern helps understand higher levels.  Red numbers indicate the order steps should be carried out.  Please confirm or correct my portrayal either visually or verbally or let me know if they are flawed beyond all hope.  Thanks.

[Jonathan Anderson]

Oh, I think I forgot a step.  Check these images for the branching case.

[Stefan]

the diagrams look ok to me.

However I'm not sure if showing everything in one single diagram is the right way: For me this seems more complicated than using one diagram for every operation.

[Jonathan Anderson]

Thanks Stefan for your feedback. 

I guess I was trying to capture the essential steps needed for someone to start developing on a branch so splitting it up would defeat the purpose.  And after looking at dozens of diagrams that do split them up, I was uncertain of how the update/commit and merge processes fit together.  The diagram may look complicated but I would suggest it's no more complicated than the task it's trying to capture.  If you disagree perhaps you could tell me which part of it is unnecessary.  

Thanks again,

Jonathan