On 12/06/08 at 22:47 +0100, Matthew Wood wrote: > Hi Lucas, > > Merged as well, but now, the following test is failing: > > 1) Error: > > ... > > I replaced the ErrorException with a ServerError, but I'm not sure it's > > correct. Please double-checked. > Thank you - lgtm it is a server-side error but - am I lost in git? I > can't run the tests :-( > > MC-S001723:~/Documents/code/xmpp4r woodm05$ git clone > [EMAIL PROTECTED]:hellomatty/xmpp4r.git > ... > Receiving objects: 100% (3052/3052), 541.71 KiB | 190 KiB/s, done. > Resolving deltas: 100% (1734/1734), done. > MC-S001723:~/Documents/code/xmpp4r woodm05$ cd xmpp4r/ > MC-S001723:~/Documents/code/xmpp4r/xmpp4r woodm05$ github pull ln > Switching to ln/master > remote: Counting objects: 477, done. > remote: Compressing objects: 100% (98/98), done. > remote: Total 316 (delta 191), reused 311 (delta 187) > Receiving objects: 100% (316/316), 39.42 KiB, done. > Resolving deltas: 100% (191/191), completed with 101 local objects. > Updating 02317e8..c57ef0a > Fast forward > ... > MC-S001723:~/Documents/code/xmpp4r/xmpp4r woodm05$ git checkout master > Switched to branch "master" > MC-S001723:~/Documents/code/xmpp4r/xmpp4r woodm05$ git rebase ln/master > First, rewinding head to replay your work on top of it... > HEAD is now at c57ef0a... Add a task description so 'rake install_gem' > shows when 'rake -T' run. > Fast-forwarded master to ln/master. > MC-S001723:~/Documents/code/xmpp4r/xmpp4r woodm05$ rake test > (in /Users/woodm05/Documents/code/xmpp4r/xmpp4r) > ./test/../lib/xmpp4r/xmppstanza.rb:6:in `require': no such file to > load -- xmpp4r/error (LoadError) > ... > > I'm very prepared to believe I'm doing something wrong here...? Any > help gratefully received...
git pull ln and check that you are up-to-date. I think that you are not. -- | Lucas Nussbaum | [EMAIL PROTECTED] http://www.lucas-nussbaum.net/ | | jabber: [EMAIL PROTECTED] GPG: 1024D/023B3F4F | _______________________________________________ Xmpp4r-devel mailing list [email protected] https://mail.gna.org/listinfo/xmpp4r-devel
