Skip to content

Instantly share code, notes, and snippets.

View dalehenrich's full-sized avatar

Dale Henrichs dalehenrich

155 followers · 382 following
View GitHub Profile
@dalehenrich
dalehenrich / plan.md
Created March 9, 2012 17:44
Metacello project plan

##Phase 1 ###FileTree basic functionality ###Metacello basic Metacello scripting API functional

  • load projects on github and in local git repositories
  • load standard mcz configurations
@dalehenrich
dalehenrich / bootstrap.st
Created March 12, 2012 20:30
Bootstrapping FileTree support into Pharo image
"Note that these instructions apply to Phase1 ... not yet alpha, so take care:)
Assuming Pharo 1.3"
"Bootstrap filetree code"
Gofer new
url: 'http://ss3.gemstone.com/ss/FileTree';
package: 'ConfigurationOfFileTree';
load.
((Smalltalk at: #ConfigurationOfFileTree) project version: '1.0') load.
@dalehenrich
dalehenrich / MCFileTreeJsonParser.st
Created April 1, 2012 18:52
simple JSON parser
'From Pharo1.3 of 16 June 2011 [Latest update: #13315] on 23 March 2012 at 9:24:50 am'!
Object subclass: #MCFileTreeJsonParser
instanceVariableNames: 'stream'
classVariableNames: ''
poolDictionaries: ''
category: 'MonticelloFileTree-Core'!
!MCFileTreeJsonParser methodsFor: 'adding' stamp: 'dkh 3/1/2012 16:36:43'!
addProperty: anAssociation to: anObject
"Add the property anAssociation described with key and value to anObject. Subclasses might want to refine this implementation."
@dalehenrich
dalehenrich / seasideLinks.md
Created April 10, 2012 15:32
Seaside links
@dalehenrich
dalehenrich / html5.md
Created April 10, 2012 16:42
HTML 5 links
@dalehenrich
dalehenrich / githubCompareAPI.md
Created April 29, 2012 17:55
github comparison urls
@dalehenrich
dalehenrich / import.st
Created April 29, 2012 22:42
Amber import Ston-Core package
CypressAmberImporter
importCypressPackages: #('Ston-Core')
prefix:'projects/ston/repository/'.
CypressAmberImporter
importCypressPackages: #('Ston-Tests')
prefix:'projects/ston/repository/'
@dalehenrich
dalehenrich / mergeAndPreserve.md
Created April 30, 2012 18:00
merge and preserve branches from a forked repository

Basic procedure gleaned from [Git: Merging from Remote Branch][1].

  1. Start with a clone of the repository into which you want to merge the branched:
git clone https://github.com/svenvc/ston.git
*Note: you'll probably want to use a writable version of the repository url. Also at any time you can destroy the clone and start over ... of course you will lose work, but if you think that there's something wrong destroy the repository before pushing a mistake up to github ... github is the repository of record.*
  1. Add a remote reference to the repository from which you want to merge:



  


  




    


          
    

      

        
        

          

              @dalehenrich
          

          

            
                dalehenrich
                / addRepos.st
            
            

              Created
              May 2, 2012 16:36
            

              
                Add a bunch of FileTree repos
              
          

        

      

        

  

    
    


        



  


  

        

          
          #('master' 'gemstone' 'pharo' 'pharo1.2.x' 'squeak' 'squeakCommon') do: [:name | | repo |
        

        

          
          	repo := (MCFileTreeRepository new directory: 
        

        

          
                              (FileDirectory on: '/opt/git/experiment/', name, '/metacello/repository/')).
        

        

          
          	MCRepositoryGroup default addRepository: repo ].
        

  





    


  




    


          
    

      

        
        

          

              @dalehenrich
          

          

            
                dalehenrich
                / gitMergeTool.md
            
            

              Created
              May 2, 2012 18:23
            

              
                git merge stuff
              
          

        

      

        

  

      

    
[source...][1].


ubuntu:


git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd "/usr/bin/diffmerge --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE"
git config --global mergetool.keepBackup false



mac: