Eric Siegerman wrote:
>
> On Wed, Jun 21, 2000 at 09:32:03AM +1000, Brian Collins wrote:
> > OK, so, if on the branch the change had looked like this:
> > Line 2 on the branch
> > Line 2A
> >
> > and on the trunk it had looked like this:
> > Line 2 on the trunk
> > Line 2A
> >
> > then adding "Line 3" on the branch after "Line 2A" would *not* have resulted in
> > a conflict?
>
> Correct, except that CVS might require more than one identical
> line in between (eg. 2B, 2C, and 2D) to be confident that it had
> put "Line 3" in the right place.
Thanks for your help, Eric. I tried it and it worked OK with just one identical
line. Guess I should have checked that before posting, eh? :-)
> Of course, the problem would still be lurking; a year from now,
> someone would end up making a change too close to "Line 2", and
> would trip across it.
True, but I can't see any simple way around it.
> The Right Thing(TM) would probably be to collapse (ie. "merge and
> forget") the branch and start a new one, rather than doing
> multiple merges from the existing one -- but I'm not quite sure
> how to do this in a context of ongoing bug-fixes to the previous
> release.
I don't think the Right Thing's practical in this situation. Our plan is to
create a patches branch for each release and tag "service packs" at various
points along the branch. Programmers fixing bugs on the branch will be required
to merge them back to the trunk as they go so that we don't end up with an
enormous merge job when we cut a new release. In 99% of cases (he said
hopefully! ;-) this should be a simple merge process because the change on the
trunk will be the same as on the branch. Of course, if there's a better way to
do it, I'm open to suggestions ...
> The expedient thing, if the "Line 2 on the trunk" changes are
> fairly localized, might be to check them in on the branch, so
> that there's no longer a disagreement.
Can't see that this will work. The situation I'm envisaging is one where the
fix on the branch is not the best way to do it and it may be implemented better
on the trunk by perhaps changing the underlying structure which is not practical
to do in a patch.
Thanks for taking the time to reply.
Regards,
> --
>
> | | /\
> |-_|/ > Eric Siegerman, Toronto, Ont. [EMAIL PROTECTED]
> | | /
> [Microsoft's] www.hotmail.com is running Apache/1.3.6 (Unix) ... on FreeBSD
> - Netcraft's "What's that site running?" service, 12-Jun-2000
--
"Everyone is ignorant, only on different subjects." (Will Rogers)
Brian Collins
Triple G Asia Pacific
http://www.tripleg.com
