You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

64 lines
3.0 KiB

  1. Mail by sasha, should be rewritten as a HOWTO sometimes
  2. vva added point C) for Windows-project
  3. -----------
  4. I have set up a repository with BitKeeper on work. There are still some things
  5. about it that I would like to learn, but I have gotten far enough with it to
  6. replace CVS functionality were are currently using, so let's just go ahead and
  7. get started on it. Please follow the instructions below (make sure to save the
  8. message for future reference):
  9. a) http://www.bitmover.com/download
  10. user: beta
  11. password: get bitkeeper
  12. get the version appropriate for your platform - download it to a temp
  13. directory, chmod +x and then run it. You will have to tell it which directory
  14. to install, for consistency, let's use /usr/local/bin
  15. b) we will take advantage of bk capablity of working with master/slave
  16. repositories. The master will be on work.mysql.com, the slaves will be our
  17. individual machines. The master repository has already been set up on work, so
  18. you will need just to set up a slave repository on your machine:
  19. mkdir bk
  20. cd bk
  21. bk clone yourusername@work:/home/bk/mysql mysql
  22. cd mysql
  23. bk -r edit
  24. Now you have the entire source tree in the current directory. Let's compile it:
  25. BUILD/compile-pentium-debug
  26. C) Windows project.
  27. - Compile Linux-project (see points above)
  28. - run VC++Files/prepare
  29. - make repository accessible for Windows (using samba)
  30. - open VC++Files/mysql.dsw in Microsoft Visual Stidio (5.0 or above)
  31. After you edit a file, you need to check it in using bk citool or bk ci
  32. filename. Note that ci is different than commit - you ci a file, but you commit
  33. a change set. This is a very nice concept - instead of thinking of each
  34. individual file as CVS does, bk groups the changes you are making and allows you
  35. to document what you actually did between the commits as a whole, rather than
  36. just commenting on every file. When you commit, bk will ask you to comment on
  37. the change set.
  38. Commit is done just to your local repository. To make your changes global, you
  39. will need to run bk push. Be careful with that - it is a good idea to run bk
  40. push -l -n first too see what you are just about to push to the master
  41. repository.
  42. When somebody does a push, you will be getting a email ( I will set this up to
  43. day). You will then need to execute bk pull to update your sources. If there are
  44. any conflicts, bk will force you to resolve them by asking you questions on what
  45. to do with each conflict.
  46. To learn more about bk, use bk helptool - I will be doing this a lot in the next
  47. couple of days :-) If you find bugs or have questions/feature
  48. suggestions/comments for developers, feel free to e-mail dev@bitmover.com .
  49. Their developers, and especially the president of the company Larry McVoy really
  50. like MySQL and are very anxious to help us. Make sure it is obvious that you
  51. work for MySQL, of course. And, of course, do not bug them with little things
  52. that you can figure out on your own or with my help - they were nice to offer us
  53. support, but we should not abuse it.