CODEWITHSUNDEEP
mercurialtortoisehg
tschiela
tschiela

Reputation: 5271

How to develop features with Mercurial correctly?

We are two developers and want to use Mercurial in our little project. We both get in touch with Mercurial the first time. We openend a Bitbucket account for our repository. I generated a test project skeleton and pushed it on the repository. My workmate clone from the repository and commited something for testing. Now he want to push that on the repository server.We got something like that:

enter image description here

I cant merge the two branches, becouse there is no head revision. I only can update the master branch and then we got something like that:

enter image description here

Is there any way to merge the two branches? What is the best practise to manage somethink like that (eg. develop a feature)? Maybe my workmate need to clone and to open a new named branch?

Upvotes: 1

Views: 89

Answers (2)

Lazy Badger
Lazy Badger

Reputation: 97365

I cant merge the two branches, becouse there is no head revision.

You can't merge for different reason - there are not branches at all. Just active changeset isn't head. hg up in CLI or updating to tip in TortoiseHG do the trick of linearization history

Update

Upvotes: 1

Eldad Assis
Eldad Assis

Reputation: 11055

Bottom line with mercurial - you always merge locally. In your repository and push back to your parent repository.

Your bitbucket repository is just a container. You keep it as a master repository and do all the work locally.

Also, as @Boas suggested, look at DVCS U and hginit. Both are great for starters (and advanced users) and will sort you well with DVCS.

Upvotes: 1

Related Questions