Alexandre Schmitt codealchemy

Title	Subtitle	Authors	JSTOR Discipline 1
Tracking Rural Change	"Community, Policy and Technology in Australia, New Zealand and Europe"		Socio

"Scar Tissues Make Relationships Wear Out"

04/26/2103. From a lecture by Professor John Ousterhout at Stanford, class CS142.

This is my most touchy-feely thought for the weekend. Here’s the basic idea: It’s really hard to build relationships that last for a long time. If you haven’t discovered this, you will discover this sooner or later. And it's hard both for personal relationships and for business relationships. And to me, it's pretty amazing that two people can stay married for 25 years without killing each other.

[Laughter]

> But honestly, most professional relationships don't last anywhere near that long. The best bands always seem to break up after 2 or 3 years. And business partnerships fall apart, and there's all these problems in these relationships that just don't last. So, why is that? Well, in my view, it’s relationships don't fail because there some single catastrophic event to destroy them, although often there is a single catastrophic event around the the end of the relation

This is way more complicated than it should be. The following conditions need to be met :

need to be able to track and merge in upstream changes
don't want remote commit messages in master
only interested in sub-directory of another repo
needs to go in a subdirectory in my repo.

In this particular case, I'm interested in bringing in the 'default' template of jsdoc as a sub-directory in my project so I could potentially make changes to the markup it genereates while also being able to update from upstream if there are changes. Ideally their template should be a separate repo added to jsdoc via a submodule -- this way I could fork it and things would be much easier.... but, it is what it is.

After much struggling with git, subtree and git-subtree, I ended up finding this http://archive.h2ik.co/2011/03/having-fun-with-git-subtree/ -- it basically sets up separate branches from tracking remote, the particular sub-directory, and uses git subtree contrib module to pull it all togther. Following are

	Plugboard = Hash[*('A'..'Z').to_a.sample(20)]
	Plugboard.merge!(Plugboard.invert)
	Plugboard.default_proc = proc { \|_, key\| key }

	def build_a_rotor
	Hash[('A'..'Z').zip(('A'..'Z').to_a.shuffle)]
	end

	ROTOR_1, ROTOR_2, ROTOR_3 = build_a_rotor, build_a_rotor, build_a_rotor

	###########################################
	# IMPORTANT NOTE:
	#
	# As of asuswrt-merlin 380.67 Beta, you
	# can now configure SSL certificates from
	# the Webui, making these instructions
	# unnecessary.
	###########################################

	sudo su postgres

	psql

	update pg_database set datistemplate=false where datname='template1';
	drop database Template1;
	create database template1 with owner=postgres encoding='UTF-8'
	lc_collate='en_US.utf8' lc_ctype='en_US.utf8' template template0;

	update pg_database set datistemplate=true where datname='template1';

	require 'active_support'

	class Foo
	def foo
	"foo"
	end

	def bar
	ActiveSupport::Deprecation.warn("bar is deprecated")

	git checkout <branch>
	git fetch <other-fork-alias>
	git cherry-pick <commit-hash>
	git push <your-fork-alias>