Fork us on GitHub Follow us on Facebook Follow us on Twitter

Version 1 (modified by Jiri Svoboda, 10 years ago) (diff)

Distributed version control magic. Hic sunt dracones.

Managing HelenOS source with Bazaar

This should help you to start using our new VCS, Bazaar. Please read this little guide carefully. Inappropriate use of Bazaar WILL make a mess in our repository.

Linear History

If you are doing a simple change (or several simple, unrelated changes) you might try to go for linear history. This will only work if nobody else pushed any changes to the main repository while you were doing your changes. Start by creating your private branch:

$ bzr branch bzr://bzr.helenos.org/head my_branch

This will create a branch (and working copy) under the directory my_branch. Now make some changes and commit them to your private branch:

$ cd my_branch
$ ...modify some files...
$ bzr commit -m "Fixed crash when writing zero bytes to FAT."

Now we can try and push back our changes to the main repository:

$ bzr push --remember bzr+http://jermar@bzr.helenos.org/head

In the command above please replace jermar with your username. Next time you can just use

$ bzr push

If nobody pushed any changes since the point you branched off, this will work. Otherwise it will fail. If it fails like this:

...

you have two options. Either rebase your changes to the mainline head or switch to structured history workflow.

Rebasing

Structured History