diff options
Diffstat (limited to 'plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team')
| -rw-r--r-- | plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team-toc.xml | 9 | ||||
| -rw-r--r-- | plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.html | 52 | ||||
| -rw-r--r-- | plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown (renamed from plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.md) | 0 |
3 files changed, 0 insertions, 61 deletions
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team-toc.xml b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team-toc.xml deleted file mode 100644 index 5b08ea0e72f..00000000000 --- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team-toc.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<toc label="Sharing Models with a Team" topic="resource/team/cdo-team.html"> - <topic href="resource/team/cdo-team.html" label="Sharing Models with a Team"> - <topic href="resource/team/cdo-team.html#Locking" label="Locking Objects"></topic> - <topic href="resource/team/cdo-team.html#Conflicts" label="Handling Conflicts"></topic> - <anchor id="cdo-team-additions"/> - </topic> - <anchor id="cdo-team-after"/> -</toc> diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.html b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.html deleted file mode 100644 index 30968f22d18..00000000000 --- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.html +++ /dev/null @@ -1,52 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <meta charset="utf-8"/> - <meta name="creator" content="Marked.app"/> -</head> -<body> -<h1 id="sharingmodelswithateam">Sharing Models with a Team</h1> - -<p>One purpose of keeping Papyrus models in a CDO model repository is to share them with a team and enjoy the benefits of real-time collaboration that CDO offers. However, this entails certain consequences that need to be accounted for in the workflow.</p> - -<h2 id="aidlockinglockingobjectsa"><a id="Locking">Locking Objects</a></h2> - -<p>The context menu in both the <strong>Model Explorer</strong> view and the diagrams has actions for locking and unlocking objects. Locking a model element reserves it for the exclusive use of the editor that has it locked. Other users connected to the same repository cannot edit it. Locking an element in a diagram locks not only the model element, but also the view of it in the diagram.</p> - -<p>An object locked by you shows a key decoration. To lock an element, use the <strong>Locks/Conflicts → Lock</strong> context menu action:</p> - -<figure> -<img src="locked.png" alt="A locally locked element" /> -<figcaption>A locally locked element</figcaption></figure> - - - -<p>To unlock an object once you have finished editing it and saved the model, use the <strong>Locks/Conflicts → Unlock</strong> context menu action. Locks are also automatically released when the editor that holds them is closed.</p> - -<p>When another user has locked an element, the editor shows a lock decoration:</p> - -<figure> -<img src="remotely_locked.png" alt="A remotely locked element" /> -<figcaption>A remotely locked element</figcaption></figure> - - - -<p>Note that in this case, the element cannot be edited: the <strong>Properties</strong> view is disabled and the diagram editor does not show the selection handles.</p> - -<h2 id="aidconflictshandlingconflictsa"><a id="Conflicts">Handling Conflicts</a></h2> - -<p>CDO is a real-time collaborative editing platform. When other users save changes they have made in models that are open in your Papyrus workbench, the repository server pushes those changes into your editors. You see those changes in real time. There is no “synchronize” step as with Git or Subversion source control.</p> - -<p>Most changes saved by other users will be in different model elements and diagram views than those in which you have unsaved changes. These do not present a problem. However, the repository may push changes in objects that you <em>have</em> edited and have not yet saved. Many of these changes, too, are automatically merged by Papyrus: changes to features of an object that you have not modified and certain changes in multi-valued features can be merged automatically. Other changes leave the objects that you have edited in a state of conflict. This is indicated by a decoration in the diagrams and the <strong>Model Explorer</strong> view:</p> - -<figure> -<img src="conflict.png" alt="Conflicting changes" /> -<figcaption>Conflicting changes</figcaption></figure> - - - -<p>Papyrus cannot automatically resolve these conflicts by merging the incoming changes from the repository with the changes made in your editor. They require manual intervention to resolve.</p> - -<p>On an object that shows conflict, invoke the <strong>Locks/Conflicts → Resolve Conflicts</strong> context menu action. In the current release, the only strategy available is to rollback the editor’s unsaved changes, leaving only the changes pushed by the server from other users. Future releases will add more options, such as an interactive graphical merge.</p> -</body> -</html>
\ No newline at end of file diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.md b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown index 4a4ae0ea3f1..4a4ae0ea3f1 100644 --- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.md +++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown |