Open main menu

Changes

Git asynchronous development

202 bytes added, 09:42, 16 October 2020
m
Switch to the {{relax developer link}} template to remove dead Gna! links.
{{historical svn}}
{{caution|This article is out of date, please see the [[Git_svn|article on using git-svn]] for a more appropriate development strategy.}}
 
== Motivation ==
Subversion needs an online repository, to store each commits. Subsequent calls to '''svn diff > patch''' will generate the difference according to the last revision. Therefore the development at the moment, require to
git br -a
Then we create the '''nmrpipe''' branch (because we edit nmrpipe.py), from where we will create the patch according to the differences of the '''sr''' branch.
git co -b nmrpipe sr
== Reviewing suggestions and modify commit ==
There were a number of [http://article.gmane.org/gmane.science.nmr.relax.devel/4120 suggestions] to the patches from {{relax developer link|username=bugman|text=Edward}}.
=== Squash commits ===
relax -s Peak_lists.test_read_peak_list_NMRPipe_seriesTab
=== Changes to pipe_control\.spectrum.py\read() ===
The above test, showed that the reading function had to be adjusted. So now we create a new branch, which is based on the branch we last edited. Meaning we copy the content of the modified files.
git co -b spectrum nmrpipe
Trusted, Bureaucrats
4,228

edits