I am getting ready to push:
hg in and hg out look fine:
(killebrew:bash) binutils1: hg in
comparing with ssh://[email protected]//gates/gate
searching for changes
no changes found
(killebrew:bash) binutils1: hg out
comparing with ssh://[email protected]//gates/gate
searching for changes
changeset: 719:d65aeb51d8ff
tag: tip
user: George Vasick <[email protected]>
date: Tue Feb 21 16:14:32 2012 -0800
description:
7145645 gas error: mod2.s: Error: attempt to get value of unresolved
symbol `L0'
However, hg pbchk reports a problem:
(killebrew:bash) binutils1: hg pbchk
.
.
.
Checking for multiple heads (or branches):
Workspace has multiple heads (or branches):
708:52e219857962 7127294 Need to upgrade openssl to 1.0.0f for six CVEs
719:d65aeb51d8ff 7145645 gas error: mod2.s: Error: attempt to get
value of unresolved symbol `L0'
You must merge and recommit.
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
_______________________________________________
userland-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/userland-discuss
