Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "MDT/OCL/Dev/EGit"
(New page: The Eclipse OCL code is maintained in a GIT repository at The capabilities of EGit are described at EGit/User Guide. The documentation here is complementary, it describes how the...) |
|||
| Line 1: | Line 1: | ||
| − | The Eclipse OCL code is maintained in a GIT repository at | + | The Eclipse OCL code is maintained in a GIT repository at git://git.eclipse.org/gitroot/mdt/org.eclipse.ocl.git which is used by [[#Clone Repository]]. |
The capabilities of [[EGit]] are described at [[EGit/User Guide]]. The documentation here is complementary, it describes how the committers use EGit to satisfy typical use cases. | The capabilities of [[EGit]] are described at [[EGit/User Guide]]. The documentation here is complementary, it describes how the committers use EGit to satisfy typical use cases. | ||
| − | == Use Cases == | + | == Complete Use Cases == |
=== Perform a Non-trivial Change === | === Perform a Non-trivial Change === | ||
| Line 11: | Line 11: | ||
A Bugzilla describes the intended change and supports communication regarding the progress of the change. | A Bugzilla describes the intended change and supports communication regarding the progress of the change. | ||
| − | The change is developed in a branch | + | The change is developed in a branch whose name starts with '''bug/''nnnnnn''''' where ''nnnnnn'' is the Bugzilla number. A short description may follow. |
| − | * [[#Create | + | * [[#Create New Branch]] or [[#Switch to Local Branch]] or [[#Switch to Remote Branch]] |
| + | * [[#Commit to Branch]] | ||
| + | * [[#Request Review]] | ||
| + | * [[#Rebase Branch onto Master]] to synchronize with concurrent development | ||
| + | * [[#Merge Branch onto Master]] | ||
| + | * [[#Merge Branch onto Another Branch]] such as a maintenance branch | ||
| + | * [[#Archive Old Branch]] to prune the EGit displays | ||
| − | == | + | == Partial Use Cases == |
| − | ===Create | + | ===Clone Repository=== |
| + | |||
| + | ===Create New Branch=== | ||
| + | |||
| + | ===Switch to Local Branch=== | ||
| + | |||
| + | ===Switch to Remote Branch=== | ||
| + | |||
| + | ===Request Review=== | ||
| + | |||
| + | ===Rebase Branch onto Master=== | ||
| + | |||
| + | ===Merge Branch onto Master=== | ||
| + | |||
| + | ===Merge Branch onto Another Branch=== | ||
| + | |||
| + | ===Archive Old Branch=== | ||
Revision as of 02:16, 29 July 2011
The Eclipse OCL code is maintained in a GIT repository at git://git.eclipse.org/gitroot/mdt/org.eclipse.ocl.git which is used by #Clone Repository.
The capabilities of EGit are described at EGit/User Guide. The documentation here is complementary, it describes how the committers use EGit to satisfy typical use cases.
Contents
Complete Use Cases
Perform a Non-trivial Change
The normal evolution of the project code involves a non-trivial change that may take a few days or weeks to develop, may need review by another committer and may occur concurrently with some other change.
A Bugzilla describes the intended change and supports communication regarding the progress of the change.
The change is developed in a branch whose name starts with bug/nnnnnn where nnnnnn is the Bugzilla number. A short description may follow.
- #Create New Branch or #Switch to Local Branch or #Switch to Remote Branch
- #Commit to Branch
- #Request Review
- #Rebase Branch onto Master to synchronize with concurrent development
- #Merge Branch onto Master
- #Merge Branch onto Another Branch such as a maintenance branch
- #Archive Old Branch to prune the EGit displays