bzr: ERROR: The file id "makefile-20111222173414-gat273n12n4zhuur-433" is not present in the tree <Inventory object at 29e5550, contents='{}'>.
I am trying to merge two branches of a project.
The branches were opened using an svn checkout
and then made locally into bzr projects with
$ bzr init
I used a graphical diff/merge tool to clean out all of the in-source build files in the development branch.
now when I try to commit the changes I get
bzr commit -m "removed lots of Demo CMakeFiles"
Committing to: /home/kesten/
missing Demos/OpenCLClo
bzr: ERROR: The file id "makefile-
It seems to be complaining that the file was removed without a bzr remove. But I can't find out how to fix this.
darKoram
bzr: ERROR: The file id "makefile-
Question information
- Language:
- English Edit question
- Status:
- Answered
- For:
- Bazaar Edit question
- Assignee:
- No assignee Edit question
- Last query:
- Last reply:
Can you help with this problem?
Provide an answer of your own, or ask kesten broughton for more information if necessary.