Confirmed users, Bureaucrats and Sysops emeriti
674
edits
Bugzilla:Committing Patches: Difference between revisions
Jump to navigation
Jump to search
You need to apply a patch to your new checkout before you can commit ;) also, not everyone uses vi
(don't use :ext:, it's implied if you leave it out, and just makes it look confusing.) |
(You need to apply a patch to your new checkout before you can commit ;) also, not everyone uses vi) |
||
| Line 2: | Line 2: | ||
1. Get a checkout of Bugzilla from cvs.mozilla.org (not from cvs-mirror.mozilla.org): | 1. Get a checkout of Bugzilla from cvs.mozilla.org (not from cvs-mirror.mozilla.org): | ||
cvs -d username%domain.com@cvs.mozilla.org:/cvsroot co Bugzilla | cvs -d username%domain.com@cvs.mozilla.org:/cvsroot co -d bugzilla Bugzilla | ||
2. Do "cvs add" for any new files or directories. Then make sure you didn't forget any new files or directories by doing: | 2. Apply the patch you'll be committing. | ||
cd bugzilla | |||
patch -p0 < patchfile | |||
3. Do "cvs add" for any new files or directories. Then make sure you didn't forget any new files or directories by doing: | |||
cvs -n commit | cvs -n commit | ||
Anything that shows up with a "?" in front of it ''might'' be something you need to add. | Anything that shows up with a "?" in front of it ''might'' be something you need to add. | ||
4. Commit the patch with "cvs commit". This will bring up an editor window, using whatever your EDITOR environment variable is set to in your shell. The following instructions assume you use '''vi''', which is the default on many systems. If you use some other editor, refer to the documentation for your editor. | |||
To start typing in the vi window, press the "i" key on your keyboard. Then you should enter a checkin comment that looks like this: | |||
Bug ''123456'': ''Bug Title Goes Here'' | Bug ''123456'': ''Bug Title Goes Here'' | ||
Patch By ''Full Name'' <''username@domain.com''> r=''mkanat'', a=''justdave'' | Patch By ''Full Name'' <''username@domain.com''> r=''mkanat'', a=''justdave'' | ||
| Line 16: | Line 22: | ||
on the keyboard, and press Enter. If you want to quit without committing (say, you made a mistake and you want to go back), instead of :wq you type :q! (with the exclamation point) and then "a" for "abort" after you leave vi. | on the keyboard, and press Enter. If you want to quit without committing (say, you made a mistake and you want to go back), instead of :wq you type :q! (with the exclamation point) and then "a" for "abort" after you leave vi. | ||
5. CVS will print out a commit message. Make sure you copy this so you can add it as a comment on the bug when you mark the bug FIXED. | |||
6. Paste the CVS commit message as a comment on the bug and mark it FIXED. | |||
[[Category:Bugzilla|S]] | [[Category:Bugzilla|S]] | ||