16 | | rm -f ~/.cvsps/\:pserver\:anonymous@cvs-mirror.mozilla.org\:#cvsroot#mozilla#webtools#bugzilla |
17 | | mkdir bugzilla.git |
18 | | git cvsimport -d ":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot" -C bugzilla.git -k mozilla/webtools/bugzilla |
| 17 | sudo port install git-core +svn |
| 18 | }}} |
| 19 | |
| 20 | * [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. |
| 21 | {{{ |
| 22 | mkdir bzr |
| 23 | cd bzr |
| 24 | bzr co bzr://bzr.mozilla.org/bugzilla/trunk bugzilla-trunk |
| 25 | bzr co bzr://bzr.mozilla.org/bugzilla/3.6 bugzilla-3.6 |
| 26 | bzr co bzr://bzr.mozilla.org/bugzilla/3.4 bugzilla-3.4 |
| 27 | bzr co bzr://bzr.mozilla.org/bugzilla/3.2 bugzilla-3.2 |
| 28 | cd .. |
40 | | # BugsSite 3.2.3 merge has parents of BugsSite r45519 and CVS tag BUGZILLA-3_2_3 |
41 | | 4b974c2db64b5e85e72498b0c43100e2ea380a48 355650f88422025d80d5b5ca7f908d653936556e 213407d24e23561c65916e86ae186f154b086dde |
42 | | # BugsSite 3.0.3 merge has parents of BugsSite r44547 and CVS tag BUGZILLA-3_0_3 |
43 | | 355650f88422025d80d5b5ca7f908d653936556e e9b8dc46dc0a804f199a0b1c2dfa4d2112608c8a bd31477381aa6204bd5e8ed5997354ccf12b6794 |
44 | | # BugsSite r30048 has parents of CVS tag BUGZILLA-2_20_1 |
45 | | 92fb2f653ac5b1b4dc9e0ec6d4a3806fe7ea1e2a ba0b747bbab5807857e66e7ff8583d27f1625fa1 |
| 49 | git remote add -f BugsSite ../BugsSite.git |
| 50 | }}} |
| 51 | |
| 52 | * Import the Bugzilla branches from bzr: |
| 53 | {{{ |
| 54 | git bzr add bugzilla-trunk ../bzr/bugzilla-trunk |
| 55 | git bzr add bugzilla-3.2-branch ../bzr/bugzilla-3.2 |
| 56 | git bzr add bugzilla-3.4-branch ../bzr/bugzilla-3.4 |
| 57 | git bzr add bugzilla-3.6-branch ../bzr/bugzilla-3.6 |
| 58 | }}} |
| 59 | NOTE: If you get an error about too many authors while importing, see [https://bugs.launchpad.net/bzr-fastimport/+bug/496677 Bug 496677]. |
| 60 | |
| 61 | * Create a .git/info/grafts file to provide artificial merge points between the two remote repositories. |
| 62 | {{{ |
| 63 | # BugsSite 3.2.3 merge has parents of BugsSite r45519 and bzr tag Bugzilla-3.2.3 |
| 64 | 4b974c2db64b5e85e72498b0c43100e2ea380a48 355650f88422025d80d5b5ca7f908d653936556e 780da003de2a006fefa6310f073e3c6be0281a6d |