| [10:02] <leonardo1> Hi guys. Can you help me? http://stackoverflow.com/questions/21698362/bazaar-error-cannot-commit-to-branch-branch1-it-is-bound-to-branch2-whic | |
| [10:46] <zyga> leonardo1: try unbinding your branch first | |
| [10:46] <zyga> leonardo1: I'm not quite sure what you did to get that error (bzr commit or bzr switch?) | |
| [10:47] <zyga> leonardo1: remember that bound branches are _branches_ not _checkouts_ | |
| [10:47] <zyga> leonardo1: so it needs to commit to the bound branch before committing to the local branch | |
| [10:47] <zyga> leonardo1: I have never tried double bound branches before | |
| [10:55] <leonardo1> zyga: I did try by unbinding the 2 branch (the local trunk checkout) and commit in the checkout of the local trunk. The commit works, goes to the local trunk, but when I try to rebind the local trunk it doesn't commit the new revision and if I try to force it with bzr commit it says that the local trunk is out of date and I need top update (even though the remote trunk is actually out of date) | |
| [10:57] <zyga> leonardo1: ok, try pushing that to both branches | |
| [10:57] <zyga> leonardo1: so that you are back in consistent state | |
| [10:57] <zyga> leonardo1: then try binding to the 1st remote and doing a test commit (feel free to do it on a seprarate repository) | |
| [10:58] <zyga> leonardo1: so that you don't commit junk to your tree | |
| [10:58] <zyga> leonardo1: remember that even with bound branches you can do --local commits | |
| [10:58] <zyga> leonardo1: and that can probably confuse the system (just guessing) | |
| [12:11] <bob2> you may be happier just not using bound branches | |
| [15:35] <superfly> I have a problem with some tags which someone accidentally added to our repository on Launchpad, and now I can't seem to get rid of them. Does anyone know how I can, once and for all, remove a tag in such a way that it cannot be added again? | |
| [16:30] <jelmer> superfly: you can't - tags are not versioned so a pull or merge can bring them back again | |
| [16:30] <jelmer> superfly: you can remove them from the launchpad repo though | |
| [16:34] <superfly> jelmer: I have the repo checked out from LP, so I did a bzr tag "..." --delete which removes it, but then someone does some work, and we get it back again :-( | |
| [16:34] <superfly> I'll try to see if I can get everyone to make a concerted effort to delete the tags | |
| [16:35] <jelmer> superfly: that ds the onry way to deal with it at the moment :( | |
| [16:37] * superfly sends a mail out to the developer mailing list | |
| [16:38] <superfly> thanks jelmer | |
| [18:22] <smw> hi all, I am stuck in lock hell. Anyone know how to fix it? Removing the entire folder didn't seem to work ERROR: Cannot lock LockDir(file:///path/to/repo/.bzr/branch-lock): lock was renamed into place, but now is missing! | |
| [18:22] <smw> I am getting this error when I try to bzr clone | |
| [18:35] <smw> I did my best. I gave up. It was a vagrant box so I am remaking it | |
| [18:35] <smw> there is something horribly wrong here | |
| === thumper is now known as thumper-afk | |
| === thumper-afk is now known as thumper | |