screwed up repo, i have no clue how i did it & how to solve it

[Kevin Bullock]

On Jan 30, 2013, at 2:00 PM, Roland Schmitz wrote:

> Hi *,
> 
> if i try to merge i get:
> $ hg merge 
> Abbort: Branch 'default' has one head - please choose one explicit revision
> ('hg heads' show all heads)
> 
> If i invoke hg heads i get:
> hg heads
> change:        150:716dbb383599
> parent:       147:6c015687d9af
> ...
> 
> How do i merge, and what do i have to merge?
> I can first answer any further questions on saturday. Till then i'm probaby 
> offline, but defenetly not in front of this computer.


Please see Matt's earlier e-mail:

On Jan 29, 2013, at 2:51 PM, Matt Mackall wrote:

> You are right in thinking something is odd here.
> 
> Please send the output of:
> 
> hg version
> hg sum (with tip checked out)
> hg heads -t
> hg heads -c
> hg log --debug tip
> cat .hg/cache/branchheads

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20130130/2f4835a8/attachment-0002.html>