22 | | * Install git-bzr. |
23 | | |
24 | | Unfortunately, there is currently a proliferation of git-bzr commands, each of which behave in a slightly different manner. Until there is a single, blessed git-bzr command, I'll assume that you're using commit `61d60075fb548f1d49d54b1a98b8b568e68ecc44` from the [http://github.com/kfish/git-bzr kfish branch of git-bzr]. |
25 | | |
26 | | If you're using MacPorts: |
27 | | |
28 | | (1) Download `Portfile` (not `Portfile.2`) from [http://trac.macports.org/ticket/24763 MacPorts ticket #24763]. |
29 | | |
30 | | (2) In a terminal window run the following commands. Note that you may want to use a different directory other than `/opt/mports/trunk/dports`, but you'll have to add it to `/opt/local/etc/macports/sources.conf`. The `/opt/mports` directory comes from instructions on [http://guide.macports.org/#installing.macports.subversion installing MacPorts from subversion]: |
| 18 | * Import `Websites/bugs.webkit.org` from the WebKit repository into a local git-svn repository. |
32 | | sudo -s |
33 | | mkdir /opt/mports/trunk/dports/devel/git-bzr |
34 | | cd /opt/mports/trunk/dports/devel/git-bzr |
35 | | mv ~/Downloads/Portfile . |
36 | | chown root:admin Portfile |
37 | | chmod 644 Portfile |
38 | | cd /opt/mports/trunk/dports |
39 | | portindex |
40 | | port install git-bzr |
41 | | exit |
42 | | }}} |
43 | | |
44 | | * [https://wiki.mozilla.org/Bugzilla:Bzr Check out Bugzilla sources] from bzr. At minimum check out trunk, the branch that contains the current version used by bugs.webkit.org and the branch that you want to merge to. |
45 | | {{{ |
46 | | mkdir bzr |
47 | | cd bzr |
48 | | bzr co bzr://bzr.mozilla.org/bugzilla/trunk bugzilla-trunk |
49 | | bzr co bzr://bzr.mozilla.org/bugzilla/4.2 bugzilla-4.2 |
50 | | bzr co bzr://bzr.mozilla.org/bugzilla/4.0 bugzilla-4.0 |
51 | | bzr co bzr://bzr.mozilla.org/bugzilla/3.6 bugzilla-3.6 |
52 | | bzr co bzr://bzr.mozilla.org/bugzilla/3.4 bugzilla-3.4 |
53 | | bzr co bzr://bzr.mozilla.org/bugzilla/3.2 bugzilla-3.2 |
54 | | cd .. |
55 | | }}} |
56 | | |
57 | | * Import BugsSite from the WebKit repository into a local git repository. |
58 | | {{{ |
59 | | mkdir BugsSite.git |
60 | | cd BugsSite.git |
61 | | git svn init -T trunk/BugsSite http://svn.webkit.org/repository/webkit |
| 20 | mkdir bugzilla.git |
| 21 | cd bugzilla.git |
| 22 | git svn init -T trunk/Websites/bugs.webkit.org http://svn.webkit.org/repository/webkit |