Hi all,
We found the following problem in THG:
Pushing a new branch and a new head at once fails. The reason is that
TortoiseHg omits the neccessary force option.
How to reproduce:
Create a fresh repo master, add and commit a file in it.
Clone it twice, say to child1 and child2.
In child1, create a changeset, for example by adding and committing another
file. Push that change.
In child2, do not pull that change. Instead, create a new change and a new
branch:
Create and add another file. Commit it on a new branch, for example
mybranch.
Update to the revision that you were on before the previous step.
Merge the head of the new branch and the current revision.
Try to push.
When you check for outgoing changes, there should be two of them. If you try to
push now, you first get an error message indicating that pushing has to force a
new branch in master. If you confirm, push is executed with the --new-branch
option.
Next an error is displayed, saying that pushing would create a new remote head.
If you confirm, push is executed without the --force option that would be
needed here. And then the iteration begins: If you confirm, you get the same
error again. (One interesting thing is that every execution of the command
contains one more instance of the --new-branch option.)
A workaround is to set the force option for push manually.
Regards
Nik
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
