On 02/21/12 05:34 PM, Ali Bahrami wrote:
On 02/21/12 05:26 PM, George Vasick wrote:
But hg merge doesn't find anything to merge:
(killebrew:bash) binutils1: hg merge
abort: branch 'default' has one head - please merge with an explicit rev
(run 'hg heads' to see all heads)
Any idea what I am doing wrong?
Thanks,
George
I saw these with my emacs fix last week. Mike told me that it
was OK, and I was in fact able to push successfully afterwards. I'll
forward you that message in a separate email.
- Ali
Following up with a more generally useful information, here's
what Norm told me about this:
This is ok since the userland gate has a 'default' branch
and an 's11-sru' branch. Each branch has it's own head.
If you had 3 or more heads, that would be a problem.
Ali
_______________________________________________
userland-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/userland-discuss
