On Tue, Apr 25, 2000 at 05:43:24PM -0500, Kyle Hargraves wrote:
> Let's assume my current project is 'proj', and it has a branch
> named 'proj-bugfixes'. I need to keep both branches fairly up to
> date with each other, as the bug fixes are important to have in
> the trunk, and the branch needs the trunk changes to fix its
> problems.
> The scheme seems to be working, but it strikes me as odd.
It seems odd to me as well... Merging bugfixes into the trunk is normal
enough, but I can't see why you would be merging back the other way.
The way I run things here is to use the trunk as a development/new features
line and, at each release, create a maintenance branch. If a bug is found in
the release, it is fixed in maint and the fix is merged into devel. Any
other changes are made to devel and kept out of maint - they're usually new
features that weren't present in the last release and they always have the
potential to introduce new bugs, so they should be kept out of the 'stable'
release version in any case.
If you're going to be regularly merging in both directions, I don't see the
point of having two separate branches.
--
The Shortest Windows Manual: "Turn off the power switch."
Geek Code 3.1: GCS d- s+: a- C++ UL++$ P+>+++ L++>++++ E- W--(++) N+ o+ !K
w---$ O M- !V PS+ PE Y+ PGP t 5++ X+ R++ tv- b++ DI++++ D G e* h+ r++ y+
