[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Vendor branches, tracking sources and creating patches

From: Ross Burton
Subject: Vendor branches, tracking sources and creating patches
Date: Wed, 20 Dec 2000 17:37:44 -0000
User-agent: eGroups-EW/0.82


I think I have this sorted out in my head but I need to run it past
some people who are "in the know", so to speak.

We are planning to create a new GCC backend, and as there will be
multiple developers it all needs to be in CVS.  We need to be able to:

1) update the version of gcc we are working from as it is updated at
2) keep all history on our custom files
3) create patches from our code to the gcc at a specific release (i.e.

I think this can be achieved if we take, for example, gcc 2.95.2 and
import into our tree as such:

tar zxvf gcc-2.95.2.tar.gz ; cd gcc-2.95.2
cvs import -m "Import of GCC 2.95.2" gcc GNU GCC_2_95_2

We can work with this, adding files and editing and files which need
to be changed.  When we need to make a diff between all of our changes
and the original 2.95.2 source, I run:

cvs rdiff -r GCC_2_95_2 -r HEAD gcc

I can also update the GCC sources when (haha) GCC 3.0 is released as

tar zxvf gcc-3.0.tar.gz ; cd gcc-3.0
cvs import -m "Import of GCC 3.0" gcc GNU GCC_3_0

Then 'cvs checkout -j' can be used to merge any conflicts.

Is this correct?

A question: is it possible to keep two lines of development going for
when (say) gcc 3.0 is released?  So in the same module we can keep GCC
2.x and GCC 3.x backends, with complete history of both their and our
code?  This sounds like a very complicated task involving branches
left, right and centre, is it?

Thanks for any help, and please also mail me personally as
seems to lag by several weeks :-(
Ross Burton
OneEighty Software

reply via email to

[Prev in Thread] Current Thread [Next in Thread]