VScaler: Using Bitbucket Repository - Revision history

David: /* Quick Notes on setting up new systems */

2017-03-31T09:21:53Z

Quick Notes on setting up new systems

David: /* Quick Notes on setting up new systems */

2017-03-31T09:17:04Z

Quick Notes on setting up new systems

David at 23:55, 8 February 2017

2017-02-08T23:55:26Z

Jon: /* Commit modifications */

2016-10-14T14:54:32Z

Commit modifications

Jon: /* Add a modified file to your local index */

2016-10-14T14:00:55Z

Add a modified file to your local index

Jon: /* Switch to fork */

2016-10-14T13:59:21Z

Switch to fork

Jon at 13:58, 14 October 2016

2016-10-14T13:58:42Z

Jon at 13:51, 14 October 2016

2016-10-14T13:51:43Z

Jon at 13:23, 14 October 2016

2016-10-14T13:23:16Z

Jon: Created page with "== Cloning main repo == Jons-MacBook:vScaler-scripts Jon$ pwd /Users/Jon/Work/vScaler-scripts Jons-MacBook:vScaler-scripts Jon$ git clone git@bitbucket.org:bostonhpc/vs..."

2016-10-14T13:16:04Z

Created page with "== Cloning main repo == <syntaxhighlight> Jons-MacBook:vScaler-scripts Jon$ pwd /Users/Jon/Work/vScaler-scripts Jons-MacBook:vScaler-scripts Jon$ git clone git@bitbucket.org:bostonhpc/vs..."

New page

== Cloning main repo ==
<syntaxhighlight>
Jons-MacBook:vScaler-scripts Jon$ pwd
/Users/Jon/Work/vScaler-scripts
Jons-MacBook:vScaler-scripts Jon$ git clone git@bitbucket.org:bostonhpc/vscaler-openhpc.git
Cloning into 'vscaler-openhpc'...
remote: Counting objects: 130, done.
remote: Compressing objects: 100% (100/100), done.
remote: Total 130 (delta 25), reused 0 (delta 0)
Receiving objects: 100% (130/130), 22.87 KiB | 0 bytes/s, done.
Resolving deltas: 100% (25/25), done.
Checking connectivity... done.
</syntaxhighlight>

== Switch to fork ==
<syntaxhighlight>
Jons-MacBook:vScaler-scripts Jon$ cd vscaler-openhpc/
Jons-MacBook:vscaler-openhpc Jon$ git fetch && git checkout jon-test
Branch jon-test set up to track remote branch jon-test from origin.
Switched to a new branch 'jon-test'
</syntaxhighlight>

@@ Line 135: / Line 135: @@
 Receiving objects: 100% (443/443), 705.97 KiB | 0 bytes/s, done.
 Resolving deltas: 100% (153/153), done.
 # Otherwise

@@ Line 124: / Line 124: @@
 <syntaxhighlight>
 # Add ssh keys to the bitbucket a/c: Profile (Top Right) -> Bitbucket Settings -> LHS Security -> SSH Keys
 git config --global user.name "David Power"
 git config --global user.email "David.Power@vScaler.com"

@@ Line 118: / Line 118: @@
 To git@bitbucket.org:bostonhpc/vscaler-openhpc.git
     4081752..f18e72f  jon-test -> jon-test
 </syntaxhighlight>

@@ Line 74: / Line 74: @@
 == Commit modifications ==
-* Use the '''<code>branch commit</code>''' command with '''<code>-am</code>''' option and add a message
+* Use the '''<code>git commit</code>''' command with '''<code>-am</code>''' option and add a message
 <syntaxhighlight>
 Jons-MacBook:python Jon$ git commit -am "Added a test file"

← Older revision		Revision as of 14:00, 14 October 2016
Line 71:		Line 71:
	new file: hello.txt		new file: hello.txt

−	~~Jons-MacBook:python Jon$ git commit -am "Added a test file"~~
	</syntaxhighlight>		</syntaxhighlight>

@@ Line 29: / Line 29: @@
 </syntaxhighlight>
-== Switch to fork ==
+== Switch to different branch ==
 * Switch to the top level directory for the local copy of your repo
 * Use the following commands:

← Older revision		Revision as of 13:58, 14 October 2016
Line 72:		Line 72:

	Jons-MacBook:python Jon$ git commit -am "Added a test file"		Jons-MacBook:python Jon$ git commit -am "Added a test file"
		+	</syntaxhighlight>
		+
		+	== Commit modifications ==
		+	* Use the '''<code>branch commit</code>''' command with '''<code>-am</code>''' option and add a message
		+	<syntaxhighlight>
		+	Jons-MacBook:python Jon$ git commit -am "Added a test file"
		+	[jon-test 6579eaf] Added a test file
		+	Committer: Jonathan Howard <Jon@Jons-MacBook.local>
		+	Your name and email address were configured automatically based
		+	on your username and hostname. Please check that they are accurate.
		+	You can suppress this message by setting them explicitly. Run the
		+	following command and follow the instructions in your editor to edit
		+	your configuration file:
		+
		+	git config --global --edit
		+
		+	After doing this, you may fix the identity used for this commit with:
		+
		+	git commit --amend --reset-author
		+
		+	1 file changed, 0 insertions(+), 0 deletions(-)
		+	create mode 100644 openhpc-installer/python/hello.txt
		+	</syntaxhighlight>
		+	* Confirm with '''<code>git status</code>'''
		+	<syntaxhighlight>
		+	Jons-MacBook:python Jon$ git status
		+	On branch jon-test
		+	Your branch is ahead of 'origin/jon-test' by 1 commit.
		+	(use "git push" to publish your local commits)
		+	nothing to commit, working directory clean
		+	</syntaxhighlight>
		+
		+	== Push commits back to web based repo ==
		+	* Use '''<code>git push origin <branch><code>''' command
		+	<syntaxhighlight>
		+	Jons-MacBook:python Jon$ git push origin jon-test
		+	Counting objects: 8, done.
		+	Delta compression using up to 4 threads.
		+	Compressing objects: 100% (8/8), done.
		+	Writing objects: 100% (8/8), 818 bytes \| 0 bytes/s, done.
		+	Total 8 (delta 2), reused 0 (delta 0)
		+	remote:
		+	remote: Create pull request for jon-test:
		+	remote: https://bitbucket.org/bostonhpc/vscaler-openhpc/pull-requests/new?source=jon-test&t=1
		+	remote:
		+	To git@bitbucket.org:bostonhpc/vscaler-openhpc.git
		+	4081752..f18e72f jon-test -> jon-test
	</syntaxhighlight>		</syntaxhighlight>

@@ Line 12: / Line 12: @@
 Resolving deltas: 100% (25/25), done.
 Checking connectivity... done.
 </syntaxhighlight>
@@ Line 25: / Line 40: @@
 Branch jon-test set up to track remote branch jon-test from origin.
 Switched to a new branch 'jon-test'
 </syntaxhighlight>

@@ Line 1: / Line 1: @@
 == Cloning main repo ==
 <syntaxhighlight>
 Jons-MacBook:vScaler-scripts Jon$ pwd
@@ Line 14: / Line 15: @@
 == Switch to fork ==
 <syntaxhighlight>
 Jons-MacBook:vScaler-scripts Jon$ cd vscaler-openhpc/