'bzr join' losing revisions?

[Jelmer Vernooij]

On Thu, Jan 23, 2014 at 04:30:27AM -0500, JP Vossen wrote:
> I have a directory structure (tree (format: 2a)) like:
> 	top			# revno 741	# shared repository: .
> 		repo1		# revno 825	# shared repository: top
> 		repo2		# revno 809	# shared repository: top
> 
> Both repo1 and repo2 were originally in top, but I broke them out
> using 'bzr split'.  Now I need to move some code (and revisions and
> history) from repo1 to repo2.  What I think I want to do at a high
> level is:
> 	bzr join repo1 and repo2 && bzr ci
> 	bzr mv repo1/some/code /repo2/elsewhere && bzr ci
> 	bzr split repo1 and repo2 && bzr ci
> 
> But when I do this:
> 	cd top
> 	bzr join repo1
> 	bzr join repo2
> 	bzr ci
> 
> All 3 locations go to revno 742 and as far as I can see I just lose
> the 741+ stuff in repo1&2!  (I'm working with copies and have
> backups and all that, so the only problem is that I can't do what I
> want...)
If you run "bzr log -n0" to display merged revisions, that should show
you the history of repo1 and repo2. By default, "bzr log" does not
show merged revisions.

Alternatively, try a tool like "bzr qlog".

Cheers,

Jelmer

> 
> I have a script that does the work, and I've been at this for hours
> and everything else works except these lost revisions.  What am I
> missing here?


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20140123/291bc86a/attachment.pgp>