I somehow messed up my project's repo, please help

[Chris Hecker]

If you sync to the online repo into a separate directory, and then copy
over just the files (not the .bzr control directory), then do a diff,
you should just get the changes you made, and you can check in there and
then push it back up.

Chris


On 2012/10/13 10:06, Rob Clewley wrote:
> Hi,
> 
> First post here, and I'm pretty new to bzr. I'm the developer of a
> python project on sourceforge, and I use their bzr repo. I use Wing
> IDE's bzr integration on a Mac.
> 
> In great haste, being a pragmatic and busy academic and not a
> professional software engineer, I recently had to patch some things in
> my primary development folder for my software that also contains my
> .bzr folder so that I could provide my students with an updated
> version quickly. In doing so, I think what I did was make a backup
> copy of the code folder, temp deleted the .bzr there and packaged the
> folder up to email my students.
> 
> I thought I'd restored everything back the way it was, and there
> certainly is a .bzr folder there now (I haven't touched it otherwise)
> that should be just the same as before. But in Wing and from the
> command line I now have every file showing up as unversioned when I
> check bzr status. Does bzr use something like file IDs to identify
> changes, so that even if the source code files are identical in
> content they are seen as new/unversioned? I'm very confused by the
> terminology, and I'm not even sure exactly what I've done.
> 
> I can't simply revert to the online repo because I have a handful of
> changes that need to be committed and uploaded to the repo, and now I
> can't even see which files are in this state because *all* files now
> show up as unversioned.
> 
> Please can someone guide me out of this pickle? I'm really stumped - I
> need to properly update my software's repo for users waiting on bug
> fixes, and I don't know how to search online for this issue
> effectively. Yes, I know I should have used a more careful workflow
> that doesn't involve fiddling with my primary dev folder in the first
> place :/
> 
> Let me know if I can provide more info / copies of files, etc.
> Thanks so much.
> -Rob
>