join and history preservation

Ken Basye basye at fas.harvard.edu
Thu Nov 17 01:23:18 UTC 2011


Hi Folks,
   I have two projects under Bazaar and I want to unify them into one 
project.  It sure looks like 'join' is just what I want to use here.  In 
particular, the doc for this command says " all history is preserved" 
which is just what I'd like.  But now I'm wondering if this means what I 
hope it means.  Suppose I do:

bzr branch <blah>/X ./merging/X    # branch project X
bzr branch <blah>/Y ./merging/X/Y  # branch project Y into a location 
within X
cd ./merging/X
bzr join Y

What I hope is that "all history is preserved" means that I have a way 
to get at past revisions of files in X/Y, revisions which were committed 
when Y was an independent project.  Actually, I don't know what else it 
*could* mean.

But I don't see how to access this history if it's there.  In 
particular, running 'bzr log <file>' on any file in X/Y errors with 
something like:   "bzr: ERROR: Path unknown at end or start of revision 
range: X/Y/foo.txt".  Also I can't revert files within Y.

I can still get logs and revert files in the X directory.

It feels like I'm missing something basic about what join does.

Thanks,
     Ken
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20111116/d1139cd6/attachment.html>


More information about the bazaar mailing list