Advertisement
Guest User

Untitled

a guest
Jun 27th, 2017
51
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.99 KB | None | 0 0
  1. rjek@trite:~/bzr-test$ # first of all, import hubbub from svn
  2. rjek@trite:~/bzr-test$ bzr branch svn://svn.netsurf-browser.org/trunk/hubbub
  3. Branched 379 revision(s).
  4. rjek@trite:~/bzr-test$ # Hubbub has some svn externals to bring in its build system and test tools that bzr doesn't bring in
  5. rjek@trite:~/bzr-test$ cd hubbub/build/
  6. rjek@trite:~/bzr-test/hubbub/build$ svn pg svn:externals ~/svn/netsurf/hubbub/build
  7. makefiles svn://svn.netsurf-browser.org/trunk/tools/buildsystem/makefiles
  8. testtools svn://svn.netsurf-browser.org/trunk/tools/buildsystem/testtools
  9.  
  10. rjek@trite:~/bzr-test/hubbub/build$ bzr branch svn://svn.netsurf-browser.org/trunk/tools/buildsystem/makefiles
  11. Branched 62 revision(s).
  12. rjek@trite:~/bzr-test/hubbub/build$ bzr branch svn://svn.netsurf-browser.org/trunk/tools/buildsystem/testtools
  13. Branched 2 revision(s).
  14. rjek@trite:~/bzr-test/hubbub/build$ # now join them
  15. rjek@trite:~/bzr-test/hubbub/build$ bzr join makefiles/
  16. renamed file:///home/rjek/bzr-test/hubbub/build/makefiles/.bzr to .bzr.retired.0
  17. rjek@trite:~/bzr-test/hubbub/build$ bzr join testtools/
  18. renamed file:///home/rjek/bzr-test/hubbub/build/testtools/.bzr to .bzr.retired.0
  19. rjek@trite:~/bzr-test/hubbub/build$ cd ..
  20. rjek@trite:~/bzr-test/hubbub$ # check in all this
  21. rjek@trite:~/bzr-test/hubbub$ bzr ci -m "Initial import of Hubbub"
  22. Committing to: /home/rjek/bzr-test/hubbub/
  23. added build/makefiles
  24. added build/testtools
  25. added build/makefiles/Makefile.gcc
  26. added build/makefiles/Makefile.norcroft
  27. added build/makefiles/Makefile.subdir
  28. added build/makefiles/Makefile.tools
  29. added build/makefiles/Makefile.top
  30. added build/testtools/testrunner.pl
  31. Committed revision 380.
  32. rjek@trite:~/bzr-test/hubbub$ cd ..
  33. rjek@trite:~/bzr-test$ # make our new project
  34. rjek@trite:~/bzr-test$ mkdir bedlam
  35. rjek@trite:~/bzr-test$ cd bedlam/
  36. rjek@trite:~/bzr-test/bedlam$ bzr init
  37. Created a standalone tree (format: 2a)
  38. rjek@trite:~/bzr-test/bedlam$ bzr branch ../hubbub/
  39. Branched 380 revision(s).
  40. rjek@trite:~/bzr-test/bedlam$ # join
  41. rjek@trite:~/bzr-test/bedlam$ bzr join hubbub/
  42. renamed file:///home/rjek/bzr-test/bedlam/hubbub/.bzr to .bzr.retired.0
  43. rjek@trite:~/bzr-test/bedlam$ bzr st
  44. working tree is out of date, run 'bzr update'
  45. renamed:
  46. / => hubbub/
  47. unknown:
  48. hubbub/.bzr.retired.0/
  49. rjek@trite:~/bzr-test/bedlam$ bzr ci -m "Import hubbub into bedlam"
  50. Committing to: /home/rjek/bzr-test/bedlam/
  51. renamed => hubbub
  52. bzr: ERROR: An inconsistent delta was supplied involving 'hubbubCOPYING', '3359@d004b94f-0d10-0410-95b5-d60e4a4a7a9a:trunk%2Fhubbub%2FCOPYING'
  53. reason: working tree does not contain new entry
  54. rjek@trite:~/bzr-test/bedlam$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement