Comment 3 for bug 539773

Revision history for this message
Angel Guzman Maeso (shakaran) wrote :

I was a couple of commands today on windows and linux. I trying to merge a branch and update. I am a bit confuse with merging/branching. Also I convert the format version of my branch:

$ bzr check
Checking working tree at '/home/shakaran/sandbox/tivion-0.0.4'.
Checking branch at 'file:///home/shakaran/sandbox/tivion-0.0.4/'.
Checking repository at 'file:///home/shakaran/sandbox/tivion-0.0.4/'.
checked repository <bzrlib.transport.local.LocalTransport url=file:///home/shakaran/sandbox/tivion-0.0.4/> format <RepositoryFormatKnitPack1>
   558 revisions
   264 file-ids
checked branch file:///home/shakaran/sandbox/tivion-0.0.4/ format Branch format 6

$ bzr upgrade --2a
starting upgrade of file:///home/shakaran/sandbox/tivion-0.0.4/
making backup of file:///home/shakaran/sandbox/tivion-0.0.4/.bzr
  to file:///home/shakaran/sandbox/tivion-0.0.4/backup.bzr
starting repository conversion
Doing on-the-fly conversion from <RepositoryFormatKnitPack1> to <RepositoryFormat2a>.
This may take some time. Upgrade the repositories to the same format for better performance.

repository converted
finished

$ bzr update
Tree is up to date at revision 416 of branch /home/shakaran/sandbox/tivion-0.0.4
shakaran@magmus:~/sandbox/tivion-0.0.4$ bzr merge tivion
Nothing to do.

If I put your command:

$ bzr log -r revid:<email address hidden> lp:~shakaran/tivion/trunk
bzr: ERROR: Server sent an unexpected error: ('error', 'Revision {<email address hidden>} not present in "CHKInventoryRepository(\'lp-66552656:///~shakaran/tivion/trunk/.bzr/repository\')".')