join and history preservation

[Jelmer Vernooij]

Hi Ken,

Am Thu 17 Nov 2011 02:23:18 CET schrieb Ken Basye:
>   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. 
You're right, it does preserve the past revisions of both original 
branches.

> 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.
Did you commit the join ? That's the only thing I can think of that 
explains the behaviour you're seeing.

If you did commit, can you perhaps list the exact commands you've tried 
to run and their output?

Cheers,

Jelmer