Tracking Third-Party Sources (Vendor Branches)?

[Erik Bågfors]

Without actually reading this document. This is how I do it.  I find
bzr to be much better at doing this than what cvs/svn is.

This is all assuming that the 3rd party source, doesn't use bzr (in
which case, it's much easier)

* Download the source
* Unpack source
    tar xzvf source.tar.gz
* Create a bzr branch
    cd source
    bzr init
    bzr add
    bzr commit -m 'initial import of 3rd party source'
* Create a new branch, where I do my hacking
    cd ..
    bzr branch source mysource

* Hack away in mysource; commit; do whatever...

Now, upstream releases a new version,
* Download it
* Go to the old 3rd party source bzr branch,
  cd source
* remove working tree
  rm -rf *
* Unpack the old source in this directory
  (This can mean, unpack and move)
* Add all new files
  bzr add
* commit the new version
  bzr ci -m 'import of  version 2"
* Merge this change to your own branch
  cd ../mysource
  bzr merge ../source
  resolve conflicts
  bzr commit -m 'import of version 2'

* hack away...

/Erik


On 5/16/06, Bob Tanner <tanner at real-time.com> wrote:
> Maybe my years of cvs usage has caused my brain to rot, but I cannot seem to
> figure out how to use bzr to track 3rd part sources like I do in cvs.
>
> http://ximbiot.com/cvs/manual/cvs-1.11.21/cvs_13.html#SEC103
>
> Is the concept to fundamental to bzr and I just don't see it?
>
> --
> 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
>
>
>