Problems building 4.8 branch
norume at aps.anl.gov
Mon Oct 15 11:49:40 UTC 2007
Yes, use of diff as shown below is easy, as long as you want to keep
the branch and trunk identical -- at which point I have to question
the reason for the branch to exist. My comment was directed towards
the problems that arise when he trunk and branch diverge, even a
little, and changes have to be carefully applied to both. My
comments were not intended to disparage CVS and I certainly no
solutions to the parallel development challenge -- to paraphrase
Churchill (?), "CVS is the worst source code management utility,
except for all the rest".
On Oct 15, 2007, at 6:34 AM, Ralf Corsepius wrote:
> On Mon, 2007-10-15 at 06:20 -0500, Eric Norum wrote:
>> Yes, that fixed it.
>> The difficulty of tracking/synchronized changes to the trunk and one
>> or more branches is the biggest flaw in CVS, IMHO.
> It hardly can be easier:
> cvs diff -u -r rtems-4-8-branch
> Try the same with svn, hg or git ...
Eric Norum <norume at aps.anl.gov>
Advanced Photon Source
Argonne National Laboratory
More information about the users