We have this situation on TortoiseHg and Bitbucket where it is stored the shared repository:
https://www.dropbox.com/s/35w7npwdzmmx128/deve1%20dev2%20clients.jpg?dl=0
The merge between the job of dev1 and dev2 shall be done by dev1; but dev1 cannot see the job of dev2 because the latest cannot push his job on the bitbucket repository since he is stopped by HG with this reason "abort: push creates new remote head 2221daef6518 on branch 'Federico Development'"
I fear that problem has been originated by one commit by dev2, the one that is marked in the picture with the 2 red circles: he committed on federico branch locally while federico was also working and committing on the same branch.
Whatever was the original cause of the problem, we would like to let the dev2 to push to the shared repository his work as a different branch head with respect to dev1 so that dev1 can pull the dev2 job and merge the two heads. Is it possible any workaround to get this result?
Secondarily, we would like to understand the origin of the problem for a better understanding and to prevent it in the future:
- is it true that the problem has been originated by the commit of dev2 ono dev1 branch?
- why HG still stops even if after that unlucky commit dev2 has changed the branch with a second commit?
- is there any way to assign to every user a specific branch or, in other words, to deny the commit access on a specific branch to some users?
