[16:57] <dije> Just got a couple of errors about 'no such file' and 'no such file or directory'
[16:57] <dije> Referencing file/dirnames ending '.tix'
[16:57] <dije> In paths containing 'repository/indices'
[16:58] <dije> Am I hosed?
[16:59] <dije> Also includes '[Errno 2]'
[17:00] <dije> Pathnames look like Python unicode strings
[17:00] <mgz> dije: probably not, is that the *only* place you have the branch? otherwise, just copy again from upstream
[17:01] <dije> I'm trying to merge from a checkout into a branch on the same machine, same filesystem
[17:02] <dije> Errors are for the branch, not the checkout
[17:02] <dije> This is one of the spokes of a hub-and-spoke setup
[17:03] <dije> So the hub should have everything that this branch has/should have
[17:03] <dije> What do I copy over? Or do I nuke the local branch and make a new one?
[17:10] <dije> OK, I *think* I understand that the thing to do is to delete (move aside, backup) my existing branch, do a new 'bzr branch', and hope that my checkout doesn't realize anything has changed.