Before reading this make sure you read: Mercurial resources and common issues.
- Don’t EVER create branches in mercurial, its an advanced use case for a very particular workflow that leads to lots of issues!
So what do you do if you should never branch.
Small Changes
Small changes can be directly committed to trunk. Under some conditions (when multiple people are mucking around with trunk, this may lead to a merge)
Big changes or people with no permission to check in to trunk
If you have a big new feature or do not have permission to check in to trunk you should create a clone. To create a clone, go to: http://code.google.com/p/videobrowser/source/checkout and click on the clone button, you will get a pristine copy of all the changes in MB to date which you own this means there will never be any conflicts or complex workflow you have to follow, this also means that anyone even people without commit rights, can commit stuff to clones.
Whenever you feel like having the latest and greatest you can pull the changes from the main trunk. If we decide to merge your changes in we can pull from your repository.