SpecialistOff.NET / Вопросы / Статьи / Фрагменты кода / Резюме / Метки / Помощь / Файлы

Working with BitBucket and Mercurial

Метки: python

Note

Adapted from a posting by Yarko Tymciurak

This assumes that you have created a local branch on your private machine where you do work, and keep it merged with the trunk.

That is, you’ve done:

• Forked a branch of http://www.bitbucket.org/BruceEckel/python-3-patterns-idioms/ (the main trunk; this fork will provide a place for review and comment)
• cloned the trunk to your local machine: - hg clone https://my_login@bitbucket.org/BruceEckel/python-3-patterns-idioms/
• cloned your local copy of trunk to create a working directory: - hg clone python-3-patterns-idioms devel

Todo

This section still work in progress:

• hg branch lp:python3patterns
• hg commit -m 'initial checkout'
• (hack, hack, hack....)
• hg merge (pull new updates)
• hg commit -m 'checkin after merge...'
• ... and so on...

When you have a new function idea, or think you’ve found a bug, ask Bruce on the group.

• If you have a new feature, create a wiki page on BitBucket and describe what you’re going to do.
• If you have found a bug, make a bug report on BitBucket (later assign it to yourself, and link your branch to it);
• If you want to work on a project, look for an unassigned bug and try to work it out - then proceed as below...

When you are ready to share your work have others review, register a branch.

Note

You can re-use one branch for multiple bug fixes.

1. Sign up for an account on BitBucket.org
2. Go to the project and select “register branch” (https://code.BitBucket.org/python3patterns/+addbranch). Suggest you create a hosted branch, then you can work locally, and pull/push as you make progress (see http://doc.Mercurial-vcs.org/latest/en/user-guide/index.html#organizing).
3. Once you have registered your branch, BitBucket will provide you with instructions on how to pull and push to your personal development copy.
4. Link your bug report or blueprint to your branch.
5. Merge from your “parent” (the trunk, or others you are working with) as needed.
6. Push your working copy to BitBucket as your work is ready for others to review or test.
7. Once you are done making your changes, have completed testing, and are ready for the project team to inspect & test, please select “propose for merging”
8. Somebody on the core team will make a test merge (it may include merging with other patches). Once tests pass, and your branch is accepted, it will be merged into the trunk.