canmove, Confirmed users
345
edits
Bugzilla:Patches: Difference between revisions
Jump to navigation
Jump to search
→Using diff: Say "bzr or CVS" and add .bzr to the --exclude
(Add Bzr instructions) |
(→Using diff: Say "bzr or CVS" and add .bzr to the --exclude) |
||
| Line 61: | Line 61: | ||
= Using diff = | = Using diff = | ||
Sometimes, for various reasons, you can't use CVS. In this case, you can get the difference between two Bugzilla ''directories'', one which contains the base Bugzilla, and one which contains your modified Bugzilla. | Sometimes, for various reasons, you can't use bzr or CVS. In this case, you can get the difference between two Bugzilla ''directories'', one which contains the base Bugzilla, and one which contains your modified Bugzilla. | ||
Here's how to use diff to make a patch: | Here's how to use diff to make a patch: | ||
| Line 69: | Line 69: | ||
2. Now, Bugzilla contains lots of things that you ''don't'' want to diff, like the localconfig file and the data/ directory. So you want to exclude all of those from your diff. Here's a command that will do that: | 2. Now, Bugzilla contains lots of things that you ''don't'' want to diff, like the localconfig file and the data/ directory. So you want to exclude all of those from your diff. Here's a command that will do that: | ||
diff -Nru --exclude=data --exclude='*.orig' --exclude=CVS --exclude=localconfig --exclude=.htaccess --exclude='.#*' --exclude='*.rej' ''old/'' ''new/'' > patch.diff | diff -Nru --exclude=data --exclude='*.orig' --exclude=CVS --exclude=localconfig --exclude=.bzr --exclude=.htaccess --exclude='.#*' --exclude='*.rej' ''old/'' ''new/'' > patch.diff | ||
Where ''old/'' is the base Bugzilla before your modifications, and ''new/'' is the Bugzilla that you modified. | Where ''old/'' is the base Bugzilla before your modifications, and ''new/'' is the Bugzilla that you modified. | ||