Just got notified of a new version of Prototype by UpdateScout.

I have a small script which pulls the git to me and then rake's the dist.

CD /D "D:\CVS+SVN+GIT Checkouts\git\prototype"
git pull

This has worked in the past on V1.6. The same technique worked when
Prototype was on SVN.

Didn't seem to work today. The log is at the bottom of the email.

I don't make any amendments to the local store. Instead, once raked, I
do a DIFF to my version so I can see what has been changed and make my
own additions.

I wiped the local version and ran ...

git clone git://github.com/sstephenson/prototype.git

Then I re-ran my script, which theoretically didn't need to get
anything from github and should be quite happy to rake dist.

And it was.

So, I suspect this is a PICNIC, but just letting you know in case its not.




remote: Counting objects: 353, done.
remote: Compressing objects: 100% (133/133), done.
remote: Total 320 (delta 240), reused 253 (delta 186)
Receiving objects: 100% (320/320), 45.51 KiB, done.
Resolving deltas: 100% (240/240), completed with 28 local objects.
>From git://github.com/sstephenson/prototype
 * [new branch]      array      -> origin/array
 * [new branch]      experimental -> origin/experimental
 + ab8895f...34ee207 master     -> origin/master  (forced update)
 * [new branch]      rewrite    -> origin/rewrite
 * [new tag]    ->
Renamed test/lib/template.erb => test/lib/templates/prototype.erb
Auto-merged test/lib/templates/prototype.erb
CONFLICT (rename/modify): Merge conflict in test/lib/templates/prototype.erb
Renamed test/lib/unittest.js => test/lib/assets/unittest.js
Auto-merged test/lib/assets/unittest.js
Auto-merged CHANGELOG
CONFLICT (content): Merge conflict in CHANGELOG
Auto-merged Rakefile
CONFLICT (content): Merge conflict in Rakefile
Auto-merged src/array.js
Auto-merged src/base.js
CONFLICT (content): Merge conflict in src/base.js
Auto-merged src/dom.js
CONFLICT (content): Merge conflict in src/dom.js
Auto-merged src/event.js
CONFLICT (content): Merge conflict in src/event.js
Auto-merged src/form.js
CONFLICT (content): Merge conflict in src/form.js
Auto-merged src/prototype.js
Auto-merged src/selector.js
Auto-merged test/lib/jstest.rb
CONFLICT (content): Merge conflict in test/lib/jstest.rb
Auto-merged test/unit/base_test.js
CONFLICT (content): Merge conflict in test/unit/base_test.js
Auto-merged test/unit/dom_test.js
CONFLICT (content): Merge conflict in test/unit/dom_test.js
Auto-merged test/unit/fixtures/dom.css
CONFLICT (add/add): Merge conflict in test/unit/fixtures/dom.css
Auto-merged test/unit/fixtures/dom.html
CONFLICT (content): Merge conflict in test/unit/fixtures/dom.html
Auto-merged test/unit/fixtures/form.html
Auto-merged test/unit/form_test.js
CONFLICT (content): Merge conflict in test/unit/form_test.js
Auto-merged test/unit/string_test.js
Automatic merge failed; fix conflicts and then commit the result.
(in D:/CVS+SVN+GIT Checkouts/git/prototype)
rake aborted!
D:/CVS+SVN+GIT Checkouts/git/prototype/rakefile:64: syntax error,
unexpected tLSHFT, expecting kEND
<<<<<<< HEAD:Rakefile
D:/CVS+SVN+GIT Checkouts/git/prototype/rakefile:73: syntax error,
unexpected tEQQ, expecting kEND
D:/CVS+SVN+GIT Checkouts/git/prototype/rakefile:80: syntax error,
unexpected tRSHFT, expecting kEND
>>>>>>> 34ee2078f8c61272b69bc9166fd0bf7f94dde5fc:Rakefile
D:/CVS+SVN+GIT Checkouts/git/prototype/rakefile:80: trailing `e' in number
>>>>>>> 34ee2078f8c61272b69bc9166fd0bf7f94dde5fc:Rakefile
D:/CVS+SVN+GIT Checkouts/git/prototype/rakefile:88: syntax error,
unexpected tLSHFT, expecting kEND
<<<<<<< HEAD:Rakefile
D:/CVS+SVN+GIT Checkouts/git/prototype/rakefile:89: syntax error,
unexpected tEQQ, expecting kEND
D:/CVS+SVN+GIT Checkouts/git/prototype/rakefile:107: syntax error,
unexpected tRSHFT, expecting kEND
>>>>>>> 34ee2078f8c61272b69bc9166fd0bf7f94dde5fc:Rakefile
D:/CVS+SVN+GIT Checkouts/git/prototype/rakefile:107: trailing `e' in number
>>>>>>> 34ee2078f8c61272b69bc9166fd0bf7f94dde5fc:Rakefile

Richard Quadling
Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498&r=213474731
"Standing on the shoulders of some very clever giants!"

You received this message because you are subscribed to the Google Groups 
"Prototype: Core" group.
To post to this group, send email to prototype-core@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 

Reply via email to