Editing Geometry package:GSoC17

Jump to navigation Jump to search
Warning: You are not logged in. Your IP address will be publicly visible if you make any edits. If you log in or create an account, your edits will be attributed to your username, along with other benefits.

The edit can be undone. Please check the comparison below to verify that this is what you want to do, and then publish the changes below to finish undoing the edit.

Latest revision Your text
Line 65: Line 65:
To test the entire procedure, go to the dummy repository [https://github.com/piyush-jain1/dummyMatGeom/ dummyMatGeom] , pull both branches in different folders, say "dummyMatGeom" for master branch and "dummyGeom" for geometry branch.
To test the entire procedure, go to the dummy repository [https://github.com/piyush-jain1/dummyMatGeom/ dummyMatGeom] , pull both branches in different folders, say "dummyMatGeom" for master branch and "dummyGeom" for geometry branch.
Then follow the given steps.
Then follow the given steps.
1. go to the local dummyMatGeom directory (named dummyMatGeom) and pull upstream (dummy matGeom) using these commands :
1. go to the local dummyMatGeom directory (named dummyMatGeom) and pull upstream (dummy matGeom) using these commands :
   - git fetch origin master
   - git fetch origin master
Line 74: Line 73:
2. run the following octave command.
2. run the following octave command.
   - rmdir("dummyGeom/deprecated","s");
   - rmdir("dummyGeom/deprecated","s");
   - copyfile("dummyMatGeom/matGeom/deprecated","dummyGeom/");
   - movefile("dummyMatGeom/matGeom/deprecated","dummyGeom/");
   - copyfile("dummyMatGeom/matGeom", "dummyGeom/");
   - movefile("dummyMatGeom/matGeom", "dummyGeom/");
   - rmdir("dummyGeom/inst","s");
   - rmdir("dummyGeom/inst","s");
   - rename("dummyGeom/matGeom","dummyGeom/inst");  
   - rename("dummyGeom/matGeom","dummyGeom/inst");  
Line 86: Line 85:
   This will sync the scripts which were already present in the geometry branch with those of the matGeom branch without disturbing other scripts.  
   This will sync the scripts which were already present in the geometry branch with those of the matGeom branch without disturbing other scripts.  


4. Now, update your local geometry repo by resetting it from the remote geometry branch.
4. Now, update your local geometry repo by force pulling from the remote branch.
   - git fetch origin geometry
   - git pull -f origin master:geometry
  - git reset --hard origin/geometry




Please note that all contributions to Octave may be edited, altered, or removed by other contributors. If you do not want your writing to be edited mercilessly, then do not submit it here.
You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource (see Octave:Copyrights for details). Do not submit copyrighted work without permission!

To edit this page, please answer the question that appears below (more info):

Cancel Editing help (opens in new window)