How To Port Forward Customizations From One Bzr Branch to a Newer Bzr Branch

[Max Kanat-Alexander]

Let's say that you have a customized Bugzilla 3.4 in a local bzr
branch, and you want to upgrade to Bugzilla 3.6. Here's how to do it:

cd custom-bugzilla-3.4
bzr bundle bzr://bzr.mozilla.org/bugzilla/3.4 > ../customizations.diff
cd ..
bzr co bzr://bzr.mozilla.org/bugzilla/3.6 new-custom-3.6
cd new-custom-3.6
bzr merge ../customizations.diff

And then resolve any conflicts, and then commit.

You can't just merge 3.6 into 3.4. Unfortunately that doesn't work,
because we frequently added patches to both 3.4 and 3.6 that are
slightly different, and thus there are conflicts. (This would work
better if we had a slightly different development methodology, but
that's something I'm still thinking about, and for now, the above
instructions work very well and are really easy to do.)

-Max
--
http://www.everythingsolved.com/
Competent, Friendly Bugzilla and Perl Services. Everything Else, too.
-
To view or change your list settings, click here:
<http://bugzilla.org/cgi-bin/mj_wwwusr?user=dev-apps...@lists.mozilla.org>