CODEWITHSUNDEEP
mercurial
user563251
user563251

Reputation: 89

Mercurial Working in Teams

We are newbies to Mercurial, we got through evaluation, etc., and are now using it for real.

The issue is the way we are using it in our teams.

We have done some research and this link looks like the same issue, but the solution looks a bit convoluted to use in practice http://blogs.oracle.com/tor/entry/mercurial_tip_checking_in_regularly.

Our problem is that we have a team of people working on the same software project -- nothing new there -- we stage pushes using a gatekeeper model.

One team member is doing a large change to "File A", this is taking a while, he has been working away, committing changes locally.

In the middle of doing work on File A, he is asked to sort out an issue and fix a problem in File B. This is to help out another developer. How can he do this? He does not want his incomplete changes for File A going into the Gatekeeper, yet he needs to get his File B changes pushed.

Upvotes: 4

Views: 232

Answers (3)

imiric
imiric

Reputation: 9010

For this specific case, and for the added flexibility it gives in general, I'd suggest you to learn and use Mercurial Queues. It's an invaluable tool everyone using Mercurial should add to their workflow.

In your case, that team member would do:

hg qinit -c
hg qnew changes-to-fileA  # creates a new patch with the outstanding changes
hg qnew changes-to-fileB  # creates a new empty patch

# work on file B

hg qrefresh               # updates the patch with changes to file B

Read the MQ tutorial for how to commit these changes to the repo.

An alternative to this would be the shelve extension, which would allow you to temporarily set aside any outstanding changes, work on file B, and then restore the changes. But using MQ gives you many additional benefits.

Upvotes: 0

masebase
masebase

Reputation: 5175

I like to use named branches. We currently create a named branch for each new feature. Then if you need a bug fix you can jump to stable or default (whatever you want to call it) with the update command. You can also use clones. So see some thoughts about the differences see Mercurial: Named Branches vs Multiple Repositories and A Guide to Branching in Mercurial.

Upvotes: 1

Andrew Cowenhoven
Andrew Cowenhoven

Reputation: 2818

Have the developer create a new local directory called File_B_Fix or similar and then clone the shared repository to that. Make the fix to file B and then push the changes back to the shared repository.

Upvotes: 6

Related Questions