Search code examples
bazaar

bzr add, but dirs remain unknown


I'm having trouble bzr adding a dir and its subdirs. If I add the dir "PSMTabBarControl2 ", then I see the following status, however bzr refuses to add certain dirs, the ones listed under "unknown".

prompt> bzr st
added:
  CONTENT/PSMTabBarControl2/
  CONTENT/PSMTabBarControl2/English.lproj/
  CONTENT/PSMTabBarControl2/English.lproj/InfoPlist.strings
  CONTENT/PSMTabBarControl2/English.lproj/PSMTabBarControlInspector.xib
  CONTENT/PSMTabBarControl2/English.lproj/PSMTabBarControlLibrary.nib/
  CONTENT/PSMTabBarControl2/English.lproj/PSMTabBarControlLibrary.nib/designable.nib
  CONTENT/PSMTabBarControl2/English.lproj/PSMTabBarControlLibrary.nib/keyedobjects.nib
  CONTENT/PSMTabBarControl2/Info.plist
  CONTENT/PSMTabBarControl2/PSMTabBarControl-Info.plist
  CONTENT/PSMTabBarControl2/PSMTabBarControl.xcodeproj/
  CONTENT/PSMTabBarControl2/PSMTabBarControl.xcodeproj/project.pbxproj
  CONTENT/PSMTabBarControl2/PSMTabBarControlView.classdescription
  CONTENT/PSMTabBarControl2/PSMTabBarControl_Prefix.pch
  CONTENT/PSMTabBarControl2/version.plist
modified:
  .bzrignore
  CONTENT/TabInterface/OPCommanderPanel/OPCommanderPanelView.m
unknown:
  CONTENT/PSMTabBarControl/
  CONTENT/PSMTabBarControl2/documentation/
  CONTENT/PSMTabBarControl2/images/
  CONTENT/PSMTabBarControl2/source/
prompt>

How do I add the things in the unknown section?

FYI: these dirs are not in my bzrignore, nor do they have strange permissions.

UPDATE: "bzr add -v" doesn't indicate why these dirs are rejected.

prompt> bzr add -v
ignored CONTENT/PSMTabBarControl2/PSMTabBarControl.xcodeproj/neoneye.mode1v3 matching "*.mode1v3"
ignored CONTENT/TabInterface/PSMTabBarControl/PSMTabBarControl.xcodeproj/neoneye.mode1v3 matching "*.mode1v3"
ignored CONTENT/PSMTabBarControl2/PSMTabBarControl.xcodeproj/default.pbxuser matching "*.pbxuser"
ignored CONTENT/PSMTabBarControl2/PSMTabBarControl.xcodeproj/neoneye.pbxuser matching "*.pbxuser"
ignored CONTENT/TabInterface/PSMTabBarControl/PSMTabBarControl.xcodeproj/neoneye.pbxuser matching "*.pbxuser"
ignored CONTENT/TabInterface/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj.~1~ matching "*~"
ignored CONTENT/.DS_Store matching ".DS_Store"
ignored CONTENT/build matching "build"
ignored CONTENT/PSMTabBarControl2/build matching "build"
prompt> 

UPDATE2: nothings happen if I try adding an unknown dir to the project. And if I try to commit, bzr says: No changes to commit.

prompt> bzr add CONTENT/PSMTabBarControl2/documentation
prompt> bzr st                                                                 
unknown:
  CONTENT/PSMTabBarControl/
  CONTENT/PSMTabBarControl2/documentation/
  CONTENT/PSMTabBarControl2/images/
  CONTENT/PSMTabBarControl2/source/
prompt> 

UPDATE3: apparent nothing wrong with the repository itself.

prompt> bzr check
Checking working tree at '/Users/neoneye/bzr/newcmd_app'.
Checking branch at 'file:///Users/neoneye/bzr/newcmd_app/'.
Checking repository at 'file:///Users/neoneye/bzr/newcmd_app/'.
checked repository <bzrlib.transport.local.LocalTransport url=file:///Users/neoneye/bzr/newcmd_app/> format <RepositoryFormat2a>
    10 revisions
   576 file-ids
checked branch file:///Users/neoneye/bzr/newcmd_app/ format Branch format 7
prompt> 

UPDATE4: recursive copy and create new repository, results in the exact same situation

prompt> cp -R newcmd_app ~/Desktop/xyz
prompt> cd ~/Desktop/xyz
prompt> rm -rf .bzr
prompt> bzr init .
prompt> bzr add .
prompt> bzr commit -m "import"
prompt> bzr st
unknown:
  CONTENT/PSMTabBarControl/
  CONTENT/PSMTabBarControl2/documentation/
  CONTENT/PSMTabBarControl2/images/
  CONTENT/PSMTabBarControl2/source/
prompt>

UPDATE5: Looking in ~/.bzr-log I see this

0.327  skip control directory '.bzr'
0.661  bzr-svn: using Subversion 1.6.5 ()

So it seems to choke on .svn dirs for some reason. Maybe if I remove the .svn dirs, then it goes away.

SOLUTION: The .svn dirs confused bazaar. Things works after removing the .svn dirs.

prompt> rm -rf `find . -type d -name .svn`
prompt>

Solution

  • It could be related to this bug and this bug. Check your ~/.bzr.log file for any indication of the problem.

    At the very least you should add comments to the above bug reports mentioning the problem exists with .svn directories as well.