| 2010-04-09 01:38:56 |
Andrew Bennetts |
description |
This is possibly related to (or a duplicate of) bug 248411, bug 50943, or bug 418929.
I have a situation in which CVS has great merging behavior and bzr has really bad merging behavior. Basically, trying to "upgrade" from one branch of Bugzilla to a newer branch of Bugzilla causes many spurious conflicts, whereas CVS works nearly perfectly.
Here's how to reproduce:
bzr branch bzr://bzr.mozilla.org/bugzilla/3.4 bugzilla
cd bugzilla
bzr merge bzr://bzr.mozilla.org/bugzilla/3.6
That produces 108 conflicts. It's the same with --lca, --weave, and --merge3. This is with bzr 2.1.1.
I seem to recall that this actually didn't happen with older versions of bzr, though I don't have any on hand to test.
Here's how to attempt the same thing with CVS:
CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot cvs co -rBUGZILLA-3_4-BRANCH -d bugzilla-3.4 Bugzilla
cd bugzilla-3.4
CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot cvs up -dP -rBUGZILLA-3_6-BRANCH
That produces 0 conflicts, with the exact same content (bzr is mirrored back to CVS). |
http://groups.google.com/group/mozilla.dev.apps.bugzilla/browse_thread/thread/358ed7399bf0a1f3 suggests this process
"""
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.)
"""
It would be nice if this were easier. |
|
