<D <M <Y
Y> M> D>

2007-03-04T14:07:31 merging with an extern svn:

I grabbed rdflib-2.3.3 from svn long ago, checked it into darcs, and did my own local patches. Now rdflib has advanced, and I wanted to see my changes against a current version. The shell is zsh.

### learn what the rev was when 2.3.3 was tagged
% svn co http://svn.rdflib.net/tags/2.3.3/ rdflib-2.3.3-tag
% cd rdflib-2.3.3-tag
% svn info

Last Changed Rev: 890

### get a trunk repo, and wind it back to r890
% cd ..
% svn co http://svn.rdflib.net/trunk/ rdflib-2.3.3-rev
% cd rdflib-2.3.3-rev
% svn up -r 890

### put my modified 2.3.3 files into that dir (isn't there a shorter cp  syntax for this? Couldn't figure it out)
% cd ..
% for x (rdflib/**/*.py) { cp $x $x:s/rdflib/rdflib-2.3.3-rev }

### bring the repo back to HEAD
% cd rdflib-2.3.3-rev
% svn up -r HEAD
% svn diff

Now I see my patches on top of the HEAD version, and if there were conflicts, I guess the last 'svn up' would have told me about them.

[Main]

Unless otherwise noted, all content licensed by Drew Perttula
under a Creative Commons License.