Tracking Third-Party Sources (Vendor Branches)?

Bob Tanner tanner at real-time.com
Thu May 18 04:33:03 BST 2006


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Matthew D. Fuller wrote:

> On Wed, May 17, 2006 at 05:39:08PM -0500 I heard the voice of
> John Arbash Meinel, and lo! it spake thus:
>> 
>> He wants them both in the same project. So that he can have:
>> 
>> myproject/
>>   library-1-upstream
>>   library-2-upstream
> 
> No, more like
>  myproject/
>    mysrc/
>    mylib/
>    imports/
>      upstream1/
>      upstream2/
>      [etc]
> 
> 
> The degenerate case would be something like the FreeBSD src CVS tree,
> which has a couple dozen different vendor branches in various places
> under it.

Something like this:

samhain-2.0.10a/
|-- COPYING
|-- LICENSE
|-- README
`-- debian
    |-- control
    |-- copyright
    `-- rules

That is the upstream source, I'd like to the upstream source an branch to
create my own hackable copy, like this:

samhain-2.0.10a-my-sid/
|-- COPYING
|-- LICENSE
|-- README
`-- debian
    |-- control
    |-- copyright
    `-- rules

Make sites specific changes related to the sid release of debian, BUT then
branch the upstream source again, like this:

samhain-2.0.10a-my-etch/
|-- COPYING
|-- LICENSE
|-- README
`-- debian
    |-- control
    |-- copyright
    `-- rules
Make site specific changes releated to the etch release of debian

Since 99% of the files in upstream, my-sid, my-etch are the same, the shared
repo stuff looks like what I want, correct?

- -- 
Bob Tanner <tanner at real-time.com>          | Phone : (952)943-8700
http://www.real-time.com, Minnesota, Linux | Fax   : (952)943-8500
Key fingerprint = AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFEa+ryfPGnCSzBsogRAtYeAKCNWso+18lgAkkqyTWtGBpJoeQdWgCgqVS8
7VAos/hjgEfcRxypS2BBVEU=
=Oq2U
-----END PGP SIGNATURE-----





More information about the bazaar mailing list