Hi Chris, First of all, thanks for the message. I think it's a great plan to move things forward!
On to the bzr issue: On Mon, Jul 11, 2011 at 2:19 PM, Chris Davis <[email protected]> wrote: > Doh... I keep thinking I've figured out bzr, but it keeps surprising me. > Apparently all these merges got committed in my local checkout but not > pushed to trunk somehow (I thought automatic pushing was the whole point of > a checkout but what do I know). I won't be able to fix this until later > tonight. Sorry for the inconvenience, I'll send another note when everything > is actually in trunk and testable. A checkout is also known as a 'bound branch', and what it does is basically push things automatically to the remote branch once they are committed to the local branch. It sounds like either you a) don't actually have a checkout but just a normal (unbound) branch or b) somehow after the changes were committed locally the push to the remote branch failed. To verify if you actually have a checkout, run 'bzr info' and look for something that looks like this: sidnei@sidnei-laptop:~/src/landscape/server/trunk$ bzr info Repository checkout (format: 2a) Location: repository checkout root: . checkout of branch: bzr+ssh://bazaar.launchpad.net/~landscape/landscape/trunk/ shared repository: /src/landscape It's easy to switch between a 'checkout' and a 'branch' by using the 'bind' and 'unbind' commands. For example: sidnei@sidnei-laptop:~/src/landscape/server/trunk$ bzr unbind sidnei@sidnei-laptop:~/src/landscape/server/trunk$ bzr info Repository tree (format: 2a) Location: shared repository: /src/landscape repository branch: . sidnei@sidnei-laptop:~/src/landscape/server/trunk$ bzr bind lp:~landscape/landscape/trunk sidnei@sidnei-laptop:~/src/landscape/server/trunk$ bzr info Repository checkout (format: 2a) Location: repository checkout root: . checkout of branch: bzr+ssh://bazaar.launchpad.net/~landscape/landscape/trunk/ shared repository: /src/landscape Hope that helps! -- Sidnei Make the most of Ubuntu with Landscape http://landscape.canonical.com _______________________________________________ Mailing list: https://launchpad.net/~graphite-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~graphite-dev More help : https://help.launchpad.net/ListHelp
