bzr: ERROR: The file id "makefile-20111222173414-gat273n12n4zhuur-433" is not present in the tree <Inventory object at 29e5550, contents='{}'>.

Asked by kesten broughton on 2011-12-23

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/VersionControlProjects/Bazaar/Engines/Bullet/bullet-2.79/

missing Demos/OpenCLClothDemo/Makefile

bzr: ERROR: The file id "makefile-20111222173414-gat273n12n4zhuur-433" is not present in the tree <Inventory object at 327b550, contents='{}'>.

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-20111222173414-gat273n12n4zhuur-433" is not present in the tree <Inventory object at 29e5550, contents='{}'>.

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
2011-12-25
Last reply:
2011-12-29
Jelmer Vernooij (jelmer) said : #1

On 12/23/2011 09:20 PM, kesten broughton wrote:
> New question #182759 on Bazaar:
> https://answers.launchpad.net/bzr/+question/182759
>
> 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/VersionControlProjects/Bazaar/Engines/Bullet/bullet-2.79/
>
> missing Demos/OpenCLClothDemo/Makefile
>
> bzr: ERROR: The file id "makefile-20111222173414-gat273n12n4zhuur-433"
is not present in the tree <Inventory object at 327b550, contents='{}'>.
>
>
> It seems to be complaining that the file was removed without a bzr
remove. But I can't find out how to fix this.
Please file a bug about this as well as the output of "bzr -Derror
commit -m 'REmoved lots of Demo CMakefiles'".

I think a workaround would be to run "bzr rm" (no arguments) before
running bzr commit. Does that work?

Cheers,

Jelmer

kesten broughton (dathomir) said : #2

I tried the bzr rm

bzr rm

http://paste.ubuntu.com/782540/
successfully removes many files

bzr commit -m "remove some qt and makefiles"

Committing to: /home/kesten/VersionControlProjects/Bazaar/Engines/Bullet/bullet-2.79/

bzr: ERROR: The file id "bullet_user_manual.p-20111222173414-gat273n12n4zhuur-9" is not present in the tree <Inventory object at 3470550, contents='{}

# so it looks like this did bzr remove the files from the working tree, but leaves it in a state that still won't allow a commit
# I decided to try making a feature branch from the svn-trunk

Bullet$ bzr branch bullet-trunk/trunk bullet-rbConstraints

bzr: ERROR: The branch bullet-trunk/trunk has no revision None.

# After doing an svn checkout i did a bzr init to create a branch on bullet-trunk/trunk

trunk$ bzr info

Repository tree (format: 2a)

Location:

  shared repository: /home/kesten/VersionControlProjects/Bazaar/Engines/Bullet

  repository branch: .

The revision None error seems to have been around in 2009
https://bugs..net/bzr/+bug/578005

"I did start trying to debug though bzr against my repository to see if I could fix something up manually, but bug #587868 got in the way a little, so I'll see if I can fix that first.
It's a pitty I didn't notice sooner, as now it's hard to say exactly how the repository got into this situation, it was an upgrade but from which repository version I am not sure."

------------------

trying to run bazaar explorer on bullet-trunk/trunk

bzr: ERROR: Revision {<email address hidden>} not present in "Graph(StackedParentsProvider(bzrlib.repository._LazyListJoin(([CachingParentsProvider(CallableToParentsProviderAdapter(<bound method CHKInventoryRepository._get_parent_map_no_fallbacks of CHKInventoryRepository('file:///home/kesten/VersionControlProjects/Bazaar/Engines/Bullet/.bzr/repository/')>))], []))))".

Jelmer Vernooij (jelmer) said : #3

Hi Kesten,

Am 25/12/11 19:50, schrieb kesten broughton:
> Question #182759 on Bazaar changed:
> https://answers.launchpad.net/bzr/+question/182759
>
> Status: Answered => Open
>
> kesten broughton is still having a problem:
> I tried the bzr rm
>
> bzr rm
>
> http://paste.ubuntu.com/782540/
> successfully removes many files
>
> bzr commit -m "remove some qt and makefiles"
>
> Committing to:
> /home/kesten/VersionControlProjects/Bazaar/Engines/Bullet/bullet-2.79/
>
> bzr: ERROR: The file id
> "bullet_user_manual.p-20111222173414-gat273n12n4zhuur-9" is not present
> in the tree<Inventory object at 3470550, contents='{}
>
> # so it looks like this did bzr remove the files from the working tree, but leaves it in a state that still won't allow a commit
> # I decided to try making a feature branch from the svn-trunk
>
> Bullet$ bzr branch bullet-trunk/trunk bullet-rbConstraints
>
> bzr: ERROR: The branch bullet-trunk/trunk has no revision None.
>
> # After doing an svn checkout i did a bzr init to create a branch on
> bullet-trunk/trunk
>
> trunk$ bzr info
>
> Repository tree (format: 2a)
>
> Location:
>
> shared repository:
> /home/kesten/VersionControlProjects/Bazaar/Engines/Bullet
>
> repository branch: .
>
>
> The revision None error seems to have been around in 2009
> https://bugs..net/bzr/+bug/578005
>
This might explain why you are getting that error. It seems that there
is a disagreement in your branches about what the contents of a certain
revision is. This is probably caused by an old bzr-svn bug, that has
since been fixed.

The best way to fix this is to resynchronise your bzr branch with the
svn repository to kill the inconsistencies.

Cheers,

Jelmer

Jelmer Vernooij (jelmer) said : #4

bzr-svn trunk now also has a command "bzr fix-svn-ancestry" that can help with fixing the broken revisions in your local repository.

Can you help with this problem?

Provide an answer of your own, or ask kesten broughton for more information if necessary.

To post a message you must log in.