joasch

2-Merge gives E160013 Error after upgrade to svn-1.7.10

Jun 25th, 2013
258
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.32 KB | None | 0 0
  1. svn tmp # wget http://ftp.drupal.org/files/projects/file_entity-7.x-2.x-dev.tar.gz
  2. --2013-06-25 16:42:13-- http://ftp.drupal.org/files/projects/file_entity-7.x-2.x-dev.tar.gz
  3. Resolving ftp.drupal.org... 140.211.166.134
  4. Connecting to ftp.drupal.org|140.211.166.134|:80... connected.
  5. HTTP request sent, awaiting response... 200 OK
  6. Length: 78846 (77K) [application/x-gzip]
  7. Saving to: 'file_entity-7.x-2.x-dev.tar.gz'
  8.  
  9. 100%[===================================================================================================================>] 78,846 140KB/s in 0.6s
  10.  
  11. 2013-06-25 16:42:14 (140 KB/s) - 'file_entity-7.x-2.x-dev.tar.gz' saved [78846/78846]
  12.  
  13. svn tmp # tar zxf file_entity-7.x-2.x-dev.tar.gz
  14. svn tmp # svn_load_dirs.pl -t dev-7.x-2.x_2013-Jun-22 -svn_username xxx -svn_password yyy svn://svn.dom.com/www/vendor/d7-modules/file_entity current /tmp/file_entity
  15. Directory /tmp/file_entity will be tagged as dev-7.x-2.x_2013-Jun-22
  16. Please examine identified tags. Are they acceptable? (Y/n) y
  17.  
  18. Checking that the base URL is a Subversion repository.
  19. Running /usr/bin/svn log -r HEAD --non-interactive --username xxx --password yyy svn://svn.dom.com/www/vendor/d7-modules/file_entity
  20.  
  21. Finding the root URL of the Subversion repository.
  22. Running /usr/bin/svn log -r HEAD --non-interactive --username xxx --password yyy svn://svn.dom.com
  23. Running /usr/bin/svn log -r HEAD --non-interactive --username xxx --password yyy svn://svn.dom.com/www
  24. Determined that the svn root URL is svn://svn.dom.com/www.
  25.  
  26. Native EOL on this system is \012.
  27.  
  28. Finding if any directories need to be created in repository.
  29. Running /usr/bin/svn log -r HEAD --non-interactive --username xxx --password yyy svn://svn.dom.com/www/vendor/d7-modules/file_entity/current
  30. No directories need to be created to prepare repository.
  31. Checking out svn://svn.dom.com/www/vendor/d7-modules/file_entity/current into /tmp/svn_load_dirs_ZOO6Ucdxm2/my_import_wc
  32. Running /usr/bin/svn checkout --non-interactive --username xxx --password yyy svn://svn.dom.com/www/vendor/d7-modules/file_entity/current my_import_wc
  33.  
  34. Loading /tmp/file_entity and will save in tag dev-7.x-2.x_2013-Jun-22.
  35. U file_entity.module
  36. U file_entity.install
  37. U file_entity.info
  38. U file_entity.file.inc
  39. U file_entity.api.php
  40. U tests/file_entity_test.info
  41. U tests/file_entity.test
  42. Running /usr/bin/svn propget svn:eol-style file_entity.info@BASE
  43. Running /usr/bin/svn propget svn:eol-style file_entity.module@BASE
  44. Running /usr/bin/svn propget svn:eol-style file_entity.api.php@BASE
  45. Running /usr/bin/svn propget svn:eol-style file_entity.install@BASE
  46. Running /usr/bin/svn propget svn:eol-style file_entity.file.inc@BASE
  47. Running /usr/bin/svn propget svn:eol-style tests/file_entity.test@BASE
  48. Running /usr/bin/svn propget svn:eol-style tests/file_entity_test.info@BASE
  49. Running /usr/bin/svn commit --non-interactive --username xxx --password yyy -m Load /tmp/file_entity into vendor/d7-modules/file_entity/current.
  50.  
  51. Running /usr/bin/svn update --non-interactive --username xxx --password yyy
  52. Running /usr/bin/svn cp --non-interactive --username xxx --password yyy -m Tag vendor/d7-modules/file_entity/current as
  53. vendor/d7-modules/file_entity/dev-7.x-2.x_2013-Jun-22.
  54. svn://svn.dom.com/www/vendor/d7-modules/file_entity/current svn://svn.dom.com/www/vendor/d7-modules/file_entity/dev-7.x-2.x_2013-Jun-22
  55. Checking out svn://svn.dom.com/www/vendor/d7-modules/file_entity/dev-7.x-2.x_2013-Jun-22 into /tmp/svn_load_dirs_ZOO6Ucdxm2/my_tag_wc_named_dev-7.x-2.x_2013-Jun-22
  56. Running /usr/bin/svn checkout --non-interactive --username xxx --password yyy svn://svn.dom.com/www/vendor/d7-modules/file_entity/dev-7.x-2.x_2013-Jun-22 my_tag_wc_named_dev-7.x-2.x_2013-Jun-22
  57. Running diff -u -x .svn -r /tmp/file_entity /tmp/svn_load_dirs_ZOO6Ucdxm2/my_tag_wc_named_dev-7.x-2.x_2013-Jun-22
  58. Cleaning up /tmp/svn_load_dirs_ZOO6Ucdxm2
  59.  
  60. svn multidrup # cd dev/sites/all/modules/file_entity
  61. svn file_entity # svn merge ^/vendor/d7-modules/file_entity/dev-7.x-2.x_2013-Jun-16 ^/vendor/d7-modules/file_entity/current
  62. --- Merging differences between repository URLs into '.':
  63. U file_entity.file.inc
  64. U tests/file_entity.test
  65. U tests/file_entity_test.info
  66. U file_entity.info
  67. U file_entity.api.php
  68. U file_entity.install
  69. U file_entity.module
  70. --- Recording mergeinfo for merge between repository URLs into '.':
  71. U .
Advertisement
Add Comment
Please, Sign In to add comment