26
edits
Geometry package:GSoC17: Difference between revisions
Jump to navigation
Jump to search
→Syncing matGeom and geometry
PiyushJain (talk | contribs) |
PiyushJain (talk | contribs) |
||
| (5 intermediate revisions by the same user not shown) | |||
| Line 63: | Line 63: | ||
To achieve this, first a workaround is implemented on a dummy repository [https://github.com/piyush-jain1/dummyMatGeom/ dummyMatGeom]. Its master branch is matGeom (dummy) and there is another branch (named geometry) is created which contains geometry package (dummy). | To achieve this, first a workaround is implemented on a dummy repository [https://github.com/piyush-jain1/dummyMatGeom/ dummyMatGeom]. Its master branch is matGeom (dummy) and there is another branch (named geometry) is created which contains geometry package (dummy). | ||
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 73: | Line 74: | ||
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/"); | ||
- | - copyfile("dummyMatGeom/matGeom", "dummyGeom/"); | ||
- rmdir("dummyGeom/inst","s"); | - rmdir("dummyGeom/inst","s"); | ||
- rename("dummyGeom/matGeom","dummyGeom/inst"); | - rename("dummyGeom/matGeom","dummyGeom/inst"); | ||
| Line 85: | Line 86: | ||
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 | 4. Now, update your local geometry repo by resetting it from the remote geometry branch. | ||
- git | - git fetch origin geometry | ||
- git reset --hard origin/geometry | |||