Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- rjek@trite:~/bzr-test$ # first of all, import hubbub from svn
- rjek@trite:~/bzr-test$ bzr branch svn://svn.netsurf-browser.org/trunk/hubbub
- Branched 379 revision(s).
- rjek@trite:~/bzr-test$ # Hubbub has some svn externals to bring in its build system and test tools that bzr doesn't bring in
- rjek@trite:~/bzr-test$ cd hubbub/build/
- rjek@trite:~/bzr-test/hubbub/build$ svn pg svn:externals ~/svn/netsurf/hubbub/build
- makefiles svn://svn.netsurf-browser.org/trunk/tools/buildsystem/makefiles
- testtools svn://svn.netsurf-browser.org/trunk/tools/buildsystem/testtools
- rjek@trite:~/bzr-test/hubbub/build$ bzr branch svn://svn.netsurf-browser.org/trunk/tools/buildsystem/makefiles
- Branched 62 revision(s).
- rjek@trite:~/bzr-test/hubbub/build$ bzr branch svn://svn.netsurf-browser.org/trunk/tools/buildsystem/testtools
- Branched 2 revision(s).
- rjek@trite:~/bzr-test/hubbub/build$ # now join them
- rjek@trite:~/bzr-test/hubbub/build$ bzr join makefiles/
- renamed file:///home/rjek/bzr-test/hubbub/build/makefiles/.bzr to .bzr.retired.0
- rjek@trite:~/bzr-test/hubbub/build$ bzr join testtools/
- renamed file:///home/rjek/bzr-test/hubbub/build/testtools/.bzr to .bzr.retired.0
- rjek@trite:~/bzr-test/hubbub/build$ cd ..
- rjek@trite:~/bzr-test/hubbub$ # check in all this
- rjek@trite:~/bzr-test/hubbub$ bzr ci -m "Initial import of Hubbub"
- Committing to: /home/rjek/bzr-test/hubbub/
- added build/makefiles
- added build/testtools
- added build/makefiles/Makefile.gcc
- added build/makefiles/Makefile.norcroft
- added build/makefiles/Makefile.subdir
- added build/makefiles/Makefile.tools
- added build/makefiles/Makefile.top
- added build/testtools/testrunner.pl
- Committed revision 380.
- rjek@trite:~/bzr-test/hubbub$ cd ..
- rjek@trite:~/bzr-test$ # make our new project
- rjek@trite:~/bzr-test$ mkdir bedlam
- rjek@trite:~/bzr-test$ cd bedlam/
- rjek@trite:~/bzr-test/bedlam$ bzr init
- Created a standalone tree (format: 2a)
- rjek@trite:~/bzr-test/bedlam$ bzr branch ../hubbub/
- Branched 380 revision(s).
- rjek@trite:~/bzr-test/bedlam$ # join
- rjek@trite:~/bzr-test/bedlam$ bzr join hubbub/
- renamed file:///home/rjek/bzr-test/bedlam/hubbub/.bzr to .bzr.retired.0
- rjek@trite:~/bzr-test/bedlam$ bzr st
- working tree is out of date, run 'bzr update'
- renamed:
- / => hubbub/
- unknown:
- hubbub/.bzr.retired.0/
- rjek@trite:~/bzr-test/bedlam$ bzr ci -m "Import hubbub into bedlam"
- Committing to: /home/rjek/bzr-test/bedlam/
- renamed => hubbub
- bzr: ERROR: An inconsistent delta was supplied involving 'hubbubCOPYING', '3359@d004b94f-0d10-0410-95b5-d60e4a4a7a9a:trunk%2Fhubbub%2FCOPYING'
- reason: working tree does not contain new entry
- rjek@trite:~/bzr-test/bedlam$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement