Integrating from multiple unrelated branches

[John Arbash Meinel]

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

Wesley J. Landaker wrote:
> Hey folks,
> 
> Here is a scenerio that keeps coming up when I use bzr, but I have not
> yet been able to solve:
> 
> Imagine there is an upstream for a particular piece of code. They don't
> have version control, they just make tarball releases. I manually track
> the upstream version by importing the tarballs when they come out, e.g.

Unfortunately, it sounds like with multiple imports of the original
source, you end up with different file ids.

We have some specs talking about being able to 'join' or 'split'
file-ids, so that you can track copies or merges like this (you can
search for 'path tokens', IIRC), but nothing that has been implemented.

One other possibility, is to start your tarball branches over from
scratch, using:

 bzr add --file-ids-from=../3rdparty/something

Which should allow bzr to match the file-ids in your newly created
tarball branch with the file-ids used by the 3rd-party tree. Obviously
that starts to break again if there is a 4th party with yet-another set
of file-ids. (Which is why we would like to have "path-tokens", but
haven't yet implemented them.)

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkmv7h0ACgkQJdeBCYSNAAMiHwCg01npqF3+rjkpjE8UpRvfP6H/
a9gAnjfKKbnvutcxpQ2ZWEeuivCFsjGQ
=G3YE
-----END PGP SIGNATURE-----