Just today my t2 branch got corrupted. I never did a merge. I always commit and push into "main" branch. There is an old "devel" branch that I never use but I do not how to delete from launchpad.
Today I tried commit and told me it was not in sync with "main" So I checked out "main" again and it came out with a different subfolder structure (basically the app was under the main/ folder but I never had a main folder). Anyway I manged to restore and when I tried to push again it tried to push into "devel" instead of "main" branch. Who told it to do so? Obviously "devel" is a very old branch so it was unable to push. Tried merge. Did not work. I edited the .bzr/branch/branch.conf and replace "devel" with "main" Pushed again and it worked. I am very puzzled. Massimo --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "web2py Web Framework" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/web2py?hl=en -~----------~----~----~----~------~----~------~--~---
