Question

Hi

Joel recommends the following in his excellent tutorial on mercurial: You can set up a team repository where a few people work on a feature together. When they are finished and the feature works well, you push the changes from the team repository to the main development repository, and then everyone else sees it.

So what we have done is: 1. Created a main repository (where we have been committing to etc.) 2. Created a clone on kiln of that repository (where we now want to 3. Created a clone on our local machine 4. Features have been push from our local machine to the kiln clone rep.

Question: Once we are done adding and testing these features, how do we now push these features into the main repository?

Thanks in advance for your feedback and recommendations

Answer 1

If you are interested just in technical side of the question, please read following instructions:

Each repository has Related tab (#1 in the picture 1) where you can manage all incoming and outgoing changesets. If you need to push changesets from your clone repo of the main repo in Kiln, you should:

1. Go to the Related page of the clone repo
2. Choose Outgoing item of the sub-menu (#2 in the picture 1)
3. Choose your main repo in the drop-down list (#3 in the picture 1)
4. Press Push link in the top right corner of the page (#4 in the picture 2)

Picture 1

Picture 2

If your question is more about best-practices, please see this posts:

• How to push fixes from dev to stable?
• What are best practices for managing pushing and pulling a branch repo to/from its parent?
• Mercurial best practice on dev + stable branch merge

Answer 2

Anton beat me to the punch with his excellent answer!

In step 2, you might want to consider creating a branch of the main repository instead of a clone. I do this for feature work that will be merged back into the parent.

This is mainly an aesthetic preference of mine -- cloning the main repository will work, too (what matters is the shared history), but I usually would reserve this for creating a new major version of the repository (e.g., 7.0 to 8.0).