This site is developed to XHTML and CSS2 W3C standards. If you see this paragraph, your browser does not support those standards and you need to upgrade. Visit WaSP for a variety of options.

Gallery Pastebin - Paste and link to it

Posted by phinze Wed 18th Jun 2008 17:22

Description: commit that fails on client but seems to go through on
server side
  1. "svn-commit.tmp" 7L, 337C written
  2. Adding         test/phpunit/ImageAreasHelperTest.class
  3. Transmitting file data .svn: Commit failed (details follow):
  4. svn: MERGE request failed on '/svnroot/gallery-contrib/trunk/gallery2/modules/imageareas/test/phpunit'
  5. svn: MERGE of '/svnroot/gallery-contrib/trunk/gallery2/modules/imageareas/test/phpunit': 200 OK (https://gallery-contrib.svn.sourceforge.net)
  6. svn: Your commit message was left in a temporary file:
  7. svn:    '/Library/WebServer/Documents/g2/modules/imageareas/svn-commit.tmp'
  8. phinze@beany:~/www/g2/modules/imageareas$ svn st
  9. ?      svn-commit.tmp
  10. A      test/phpunit/ImageAreasHelperTest.class
  11. ?      img/imageareas-ui.psd
  12. ?      js/dragresize.html
  13. ?      js/dragresize_commented.js
  14. phinze@beany:~/www/g2/modules/imageareas$ svn rm test/phpunit/ImageAreasHelperTest.class
  15. svn: Use --force to override this restriction
  16. svn: 'test/phpunit/ImageAreasHelperTest.class' has local modifications
  17. phinze@beany:~/www/g2/modules/imageareas$ svn rm --force test/phpunit/ImageAreasHelperTest.class
  18. D         test/phpunit/ImageAreasHelperTest.class
  19. phinze@beany:~/www/g2/modules/imageareas$ svn st
  20. ?      svn-commit.tmp
  21. ?      img/imageareas-ui.psd
  22. ?      js/dragresize.html
  23. ?      js/dragresize_commented.js
  24. phinze@beany:~/www/g2/modules/imageareas$ svn up
  25. A    test/phpunit/ImageAreasHelperTest.class
  26. Updated to revision 1463.
  27. phinze@beany:~/www/g2/modules/imageareas$ rm svn-commit.tmp
  28. phinze@beany:~/www/g2/modules/imageareas$ svn st
  29. ?      img/imageareas-ui.psd
  30. ?      js/dragresize.html
  31. ?      js/dragresize_commented.js
  32. phinze@beany:~/www/g2/modules/imageareas$ ls
  33. ImageAreasCallback.inc  classes/                img/                    module.inc              test/
  34. Preloads.inc            css/                    js/                     templates/
  35. phinze@beany:~/www/g2/modules/imageareas$ svn st
  36. ?      img/imageareas-ui.psd
  37. ?      js/dragresize.html
  38. ?      js/dragresize_commented.js
  39. phinze@beany:~/www/g2/modules/imageareas$ svn up
  40. At revision 1463.
  41. phinze@beany:~/www/g2/modules/imageareas$

PermaLink to this entry http://tools.gallery2.org/pastebin/1997 Download 1997.txt
Submit a correction or amendment below. (click here to make a fresh posting)

Your Name
Syntax:
For (optional)
Leave permalink as note for user. Remember my name in a cookie

Select channel for announcement:
#gallery#gallery-support

Code: To ensure legibility, keep your code lines under 80 characters long.

You can highlight lines: start with "@#" and end with "!#"

Description: You can leave a small description for your code. (Errors, etc)

Please note that your script will be available publicly.
Page generated in 0.113 seconds.