bzr switch
on each of the locations where I had been working on the project.C:\Projects\ABC>bzr switch v:\bzr\ABC
Tree is up to date at revision 145.
Switched to branch: V:/bzr/ABC/
Remember to commit any changes you have first!
A place to track solutions to problems encountered during Delphi programming and other helpful hints, tips and comments.
bzr switch
on each of the locations where I had been working on the project.C:\Projects\ABC>bzr switch v:\bzr\ABC
Tree is up to date at revision 145.
Switched to branch: V:/bzr/ABC/
bzr move
from one branch to another. So the solution was to use the export/import merge solution...DisplayProgram>bzr fast-export . > full-branch.fi ..DisplayProgram>bzr fast-import-filter -i Statistics.pas full-branch.fi > Statistics.fi ..DisplayProgram>mkdir ..\Temp ..DisplayProgram>bzr init ..\Temp ..DisplayProgram>bzr fast-import Statistics.fi ..\Temp ..DisplayProgram>cd ..\CommonSource ..CommonSource>bzr merge ..\Temp -r0..-1 ..CommonSource>bzr commit -m "Moved file from SourceDisplay using export/import then merge"From:
..DisplayProgram>bzr rm Statistics.pas ..DisplayProgram>bzr commit -m "Final step of moving file to common place"
Statistics.pas
, appeared in the temporary directory. I created a brand spanking new directory, even with a different name, but the old file seem to appear magically....bzr fast-import
help...Restarting an import:
At checkpoints and on completion, the commit-id -> revision-id
map is saved to a file called 'fastimport-id-map' in the control
directory for the repository (e.g. .bzr/repository). If the import
is interrupted or unexpectedly crashes, it can be started again
and this file will be used to skip over already loaded revisions.
As long as subsequent exports from the original source begin
with exactly the same revisions, you can use this feature to
maintain a mirror of a repository managed by a foreign tool.
If and when Bazaar is used to manage the repository, this file
can be safely deleted.
So, remove the fastimport-id-map
file in the .bzr/repository directory when you are done with the import! Then you are ready to do another one :)