Merging Changes

From PyGarmin

If you are a member of the pygarmin-dev team, you can commit changes to the trunk branch. This means that you can merge in patches or branches from other people into trunk. When merging in patches, they should preferably be merge-directives, which is an annotated patch file. This makes sure that the credit for the code changes goes to the one who wrote the changes.

First, you should make sure that bzr is authenticated using your Launchpad account, so that it has permission to write to the trunk branch:

$ bzr launchpad-login your-lp-name

After that you have to get the trunk branch:

$ bzr branch lp:pygarmin trunk

Now you can merge in the branches, using bzr merge $branch_or_patch. You can merge in either a branch, or a merge directive. For example, if you have a merge directive called edge-305.patch, you would do something like this:

$ cd trunk
$ bzr merge ../edge-305.patch

Next you have to commit the changes and provide a commit message, describing the changes:

$ bzr commit

Now the changes are only commited to your local branch. The last thing you need to do is to push them back to Launchpad:

$ bzr push lp:pygarmin