>We believe now that the best way to handle this would be to create a branch
>any time somebody starts a new project and let them do all their
>development on that branch. Then get them to merge back to the stable trunk
>at time their project is ready for prime-time.
I think you're on to something :)
>The problem we are having directly atm is that we wish to branch off where
>our current trunk/head development is to a branch so that we don't lose any
>code, but then we also wish to take one of the previous branch/head's and
>turn that into the mainline stable trunk/head that we can then further
>merge back into.
Uhh, this seems very confusing to me, are you really certain this is a
good move. I would recommend
trying to stick with keeping procedures as simple as possible to avoid
confusion which in it self can
cause problems. Trunk is just that, trunk, the finest most evolved
version of the software. Why do you
feel the need to suddenly abandon it for a branch?
I would stick with branches for features and then merge them to trunk,
or if things are uncertain, do all
dev on branches and make decisions on what should be on trunk and not.
Nothing is stopping you from
releasing certain stuff from a branch, you can merge other branches or
trunk into any feature branch if
that is needed.
>If I get a working copy down using tortoise (r41) we cannot then make that
>effectively become our trunk (> the previous trunk head of r100). When I
>then tried to commit that r41 to the head of the repository I got an error
>telling me that things were out of date and that I should do an update and
>I got an error of 106-1 or something to that effect.
So if I understand this right, your software is evolving from r41 to
r100 when you suddenly realize that
all the work in r41-r100 are pretty much worthless and should be
abandoned? This sounds very confusing
to me. Maybe more then the versioning system should be looked into here?
It's always possible to reverse
merge to get back to r41 and there are other methods as well but I'd
give my procedures a real good
thought before I did anything like that.
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Thu Sep 8 14:48:23 2005