|
|
| Line 36: |
Line 36: |
| = Updating to a Newer Release = | | = Updating to a Newer Release = |
|
| |
|
| == No local changes ==
| | See https://bugzilla.readthedocs.org/en/latest/installing/upgrading-with-git.html . |
| | |
| If you have no local changes to any tracked files, upgrading to both minor and major releases is simple:
| |
| | |
| git fetch
| |
| git checkout bugzilla-(version)
| |
| | |
| where ''(version)'' is the version number that you want to update to, like <code>4.4.2</code>.
| |
| | |
| == Local, uncommitted changes ==
| |
| | |
| The above checkout command will fail if you've made any modifications to files you checked out from git with a warning about overwriting local changes. In this case, the simple solution is to stash and then reapply your changes (assuming you've done the "git fetch" already):
| |
| | |
| git stash save
| |
| git checkout bugzilla-(version)
| |
| git stash apply
| |
| | |
| However, it is better to create a local branch, which is one of git's strengths. You can track your customizations and merge in changes from upstream.
| |
| | |
| == Local branch ==
| |
| | |
| ...
| |
| | |
| = Creating patches with git =
| |
|
| |
|
| = Checking in using git = | | = Checking in using git = |
|
| |
|
| See [[Bugzilla:Committing_Patches]]. | | See [[Bugzilla:Committing_Patches]]. |
|
| |
| = Writing Patches On Top of Other Patches =
| |
|
| |
|
| [[category:Bugzilla]] | | [[category:Bugzilla]] |