TerraLib and TerraView Wiki Page

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
wiki:documentation:devguide:branches_and_tags [2015/12/09 09:12]
gribeiro [Branches]
wiki:documentation:devguide:branches_and_tags [2018/08/23 17:07] (current)
marisa [Branches]
Line 9: Line 9:
 The output of above command will be something like: The output of above command will be something like:
 <code bash> <code bash>
-  ​* master+* master 
 +  release-5.4 
 +  release-5.3 
 +  release-5.2
   remotes/​origin/​HEAD -> origin/​master   remotes/​origin/​HEAD -> origin/​master
   remotes/​origin/​develop   remotes/​origin/​develop
-  remotes/​origin/​layout_stabilization 
   remotes/​origin/​master   remotes/​origin/​master
-  remotes/​origin/​new_plugin 
-  remotes/​origin/​qt4_compatibility 
   remotes/​origin/​release-5.0   remotes/​origin/​release-5.0
   remotes/​origin/​release-5.0.0-alpha   remotes/​origin/​release-5.0.0-alpha
   remotes/​origin/​release-5.0.0-beta   remotes/​origin/​release-5.0.0-beta
   remotes/​origin/​release-5.1   remotes/​origin/​release-5.1
-  remotes/​origin/​rpath_fix+  remotes/​origin/​release-5.2 
 +  remotes/​upstream/​develop 
 +  remotes/​upstream/​master 
 +  remotes/​upstream/​release-5.0 
 +  remotes/​upstream/​release-5.0.0-alpha 
 +  remotes/​upstream/​release-5.0.0-beta 
 +  remotes/​upstream/​release-5.1 
 +  remotes/​upstream/​release-5.2
 </​code>​ </​code>​
  
Line 26: Line 33:
  
 We have the following branches: We have the following branches:
-  * **develop:​** This is the branch where the development team is working to add new features to future versions of TerraLib and TerraView. It may be instable ​although ​the codebase is subject to automatic tests (regression and unittests). We don't recommend to generate production versions of TerraLib/​TerraView from this branch. Use it for testing new features and get involved with TerraLib/​TerraView development.+  * **develop:​** This is the branch where the development team is working to add new features to future versions of TerraLib and TerraView. It may be unstable ​although ​all updates((merge request in GIT)are accepted only after building in all platform. We don't recommend to generate production versions of TerraLib/​TerraView from this branch. Use it for testing new features and get involved with TerraLib/​TerraView development
 + 
 +  * **release-5.4:​** This is the branch for TerraLib generation //​5.4.z//​. 
 + 
 +  * **release-5.3:​** This is the branch for TerraLib generation //​5.3.z//​. 
 + 
 +  * **release-5.2:​** This is the branch for TerraLib generation //5.2.z//.
  
   * **release-5.1:​** This is the branch for TerraLib generation //5.1.z//.   * **release-5.1:​** This is the branch for TerraLib generation //5.1.z//.
  
   * **release-5.0:​** This is the branch for TerraLib generation //5.0.z//.   * **release-5.0:​** This is the branch for TerraLib generation //5.0.z//.
 + 
 +  * **master:** This is the default branch((after //clone// command)).
  
-  * **new_plugin:​** This branch contains some modifications in TerraLib'​s plugin system. It has been used only for tests and prototyping. 
  
 In order to switch to one of the branches listed above, use the checkout command and create a local branch to track the remote branch. The syntax of ''​git checkout''​ is: In order to switch to one of the branches listed above, use the checkout command and create a local branch to track the remote branch. The syntax of ''​git checkout''​ is:
Line 66: Line 80:
 $ git checkout -b 5.0.1  5.0.1 $ git checkout -b 5.0.1  5.0.1
 </​code>​ </​code>​
 +
 +
 +----
 +
 +After selecting the right branch or tag, please, read the [[:​wiki:​documentation:​devguide:​src_instructions|Source Code Instructions]] section.