Git asynchronous development - Revision history

Bugman: Switch to the {{relax developer link}} template to remove dead Gna! links.

2020-10-16T09:42:19Z

Switch to the {{relax developer link}} template to remove dead Gna! links.

Bugman: Transclusion of the {{historical svn}} template.

2017-10-27T11:47:51Z

Transclusion of the {{historical svn}} template.

Bugman: Editing of the caution.

2015-10-19T17:39:02Z

Editing of the caution.

Bugman: Added a caution to the top of the article to explain that this is out of date.

2015-10-19T17:38:28Z

Added a caution to the top of the article to explain that this is out of date.

Bugman: /* Changes to pipe_control\spectrum.py\read() */ Use the Python module naming convention for the section title.

2015-10-19T17:36:07Z

Changes to pipe_control\spectrum.py\read(): Use the Python module naming convention for the section title.

Bugman: Link to my Gna! page.

2014-09-13T07:58:10Z

Link to my Gna! page.

Troels Emtekær Linnet: /* Preparation */

2013-07-22T15:17:57Z

Preparation

Troels Emtekær Linnet at 15:17, 22 July 2013

2013-07-22T15:17:19Z

Troels Emtekær Linnet: /* Preparation */

2013-07-22T15:02:25Z

Preparation

Troels Emtekær Linnet: /* Initialization of git */

2013-07-22T15:00:04Z

Initialization of git

@@ Line 164: / Line 164: @@
 == 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 [https://gna.org/users/bugman Edward].
+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 ===

← Older revision		Revision as of 11:47, 27 October 2017
Line 1:		Line 1:
		+	{{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.}}		{{caution\|This article is out of date, please see the [[Git_svn\|article on using git-svn]] for a more appropriate development strategy.}}

← Older revision		Revision as of 17:39, 19 October 2015
Line 1:		Line 1:
−	{{caution\|This article is out of date, please see [[Git_svn]] for a more appropriate development strategy.}}	+	{{caution\|This article is out of date, please see the [[Git_svn\|article on using git-svn]] for a more appropriate development strategy.}}

	== Motivation ==		== Motivation ==

← Older revision		Revision as of 17:38, 19 October 2015
Line 1:		Line 1:
		+	{{caution\|This article is out of date, please see [[Git_svn]] for a more appropriate development strategy.}}
		+
	== Motivation ==		== 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		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

@@ Line 185: / Line 185: @@
   relax -s Peak_lists.test_read_peak_list_NMRPipe_seriesTab
-=== Changes to pipe_control\spectrum.py\read() ===
+=== Changes to pipe_control.spectrum.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

@@ Line 31: / Line 31: @@
   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.
+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

@@ Line 31: / Line 31: @@
   git br -a
-Then we create the '''seriestab''' branch, from where we will create the patch according to the differences of the '''sr''' branch.
+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 seriestab sr
+  git co -b nmrpipe sr
 === Checking out a development branch ===
@@ Line 68: / Line 68: @@
   git log -p
-Now create your patch, comparing to the sr branch
+Now create your [[Git_patch | git patch]], comparing to the sr branch
-  git format-patch sr
+  git format-patch sr --stdout > nmrpipe.patch
 === Modification 2 ===
@@ Line 112: / Line 112: @@
 Now create your patches, comparing to the sr branch
-  git format-patch sr
+  git format-patch sr --stdout > nmrpipe2.patch
-This should provide two patch files
+This should provide you with a second patch files, with more commits.
 === Getting an overview ===
@@ Line 134: / Line 134: @@
 Now create your patch, comparing to the sr branch
-  git format-patch sr
+  git format-patch sr --stdout > nmrpipe3.patch
 === Continuation ===
@@ Line 153: / Line 153: @@
 === Upload patches ===
 First delete all the previous made patches.
-  rm -r 000*.patch
+  rm -r *.patch
 Now create your patches, comparing to the sr branch
-  git format-patch sr
+  git format-patch sr --stdout > nmrpipe.patch
-Then upload a zip file with all the patches to the [https://gna.org/support/?group=relax support tracker].
+Then upload the [[git_patch|git patch]] to the [https://gna.org/support/?group=relax support tracker].
 == Reviewing suggestions and modify commit ==
-There were a number of [http://article.gmane.org/gmane.science.nmr.relax.devel/4120 suggestions] to the patches.
+There were a number of [http://article.gmane.org/gmane.science.nmr.relax.devel/4120 suggestions] to the patches from Edward.
 === Squash commits ===
@@ Line 186: / Line 186: @@
 === 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.
+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 sr2 seriestab
+  git co -b spectrum nmrpipe
- git add pipe_control\spectrum.py
+  git diff --stat --color nmrpipe..spectrum
 The last line, should show an empty line for "no changes".
@@ Line 198: / Line 195: @@
 === Finishing up ===
 Delete old patches
-  rm 000*.patch
+  rm *.patch
 First change to the first branch we made changes is
-  git co seriestab
+  git co nmrpipe
-  git format-patch sr
+  git format-patch sr --stdout > nmrpipe.patch
   git co spectrum
-  git format-patch sr2
+  git format-patch nmrpipe --stdout > spectrum.patch
 == See also ==

@@ Line 15: / Line 15: @@
 == Initialization of git ==
-Navigate to the root folder of the branch of relax, you want to develop. Initialize with:
+Navigate to the root folder of the branch of relax, you want to develop. Then follow the this post [[Git_svn#relax_branches_at_github | relax_branches_at_github]]
 === Setup commit information ===