So, I’m just getting started with Bazaar. I am using Bazaar explorer for Windows as the GUI.
I can see how to send my changes via email, but I don’t know what to do with the change file once I have it. Where do I put the change file, how do I merge the changes into the Trunk?
If I select merge, and then the folder containing the change file I get an error message that says the folder I’ve selected is not a branch. Pulling changes works the same way. If I place the change file in with the branch, that doesn’t do anything. I’m sure it’s something simple.
Thanks
Clarification:
I am not talking about compressing the whole project, emailing the compressed file, unpacking and merging. I’m talking about the export funciton mentioned here:
http://doc.bazaar.canonical.com/explorer/en/visual-tour-windows.html#export
Maybe I’m misunderstanding the purpose of the export function.
Right now I’m leaning towards setting up a VPN for anyone on the project so we can work more directly.
Even if you can’t get the e-mail work flow going, I don’t think you need a VPN. It sounds like you can set up an SFTP server, give each user write access to their own repository, and give them read access to everybody else’s repositories. Then you can push or commit to your own branches and pull, update, or merge from everyone else’s branches.
If it’s not obvious how to set that up, I’d recommend you set up an account on Launchpad to play around with branches and merging. It will probably be easier to set up your own server after you and some of your team mates have gotten a little demo project working on Launchpad.
In case it’s helpful, here’s a summary of my Bazaar workflow on an open-source project. It covers setting up branches, merging changes, and creating merge proposals.