From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rocco Rutte Subject: Re: hg2git error Date: Mon, 25 May 2009 15:22:42 +0200 Message-ID: <20090525132242.GB3259@robert> References: <20090525113418.GA3259@robert> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Matthias Urlichs , git@vger.kernel.org To: Johannes Schindelin X-From: git-owner@vger.kernel.org Mon May 25 15:23:01 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1M8a8q-0000gt-HS for gcvg-git-2@gmane.org; Mon, 25 May 2009 15:23:00 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753042AbZEYNWq (ORCPT ); Mon, 25 May 2009 09:22:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752192AbZEYNWq (ORCPT ); Mon, 25 May 2009 09:22:46 -0400 Received: from mail.gmx.net ([213.165.64.20]:37920 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751249AbZEYNWp (ORCPT ); Mon, 25 May 2009 09:22:45 -0400 Received: (qmail invoked by alias); 25 May 2009 13:22:44 -0000 Received: from dslb-094-222-114-239.pools.arcor-ip.net (EHLO robert) [94.222.114.239] by mail.gmx.net (mp050) with SMTP; 25 May 2009 15:22:44 +0200 X-Authenticated: #1642131 X-Provags-ID: V01U2FsdGVkX180uYBZ06I0lRvYfs85JlKTFB23CURsOATQ1PvBGS 9JuiazbY8nNWOS Mail-Followup-To: Johannes Schindelin , Matthias Urlichs , git@vger.kernel.org Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-05-15) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.64 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, * Johannes Schindelin wrote: > On Mon, 25 May 2009, Rocco Rutte wrote: > > * Johannes Schindelin wrote: > > > Error: repository has at least one unnamed head: hg r533 > > I'm afraid there's nothing you can do except a) wait until somebody with > > push access to the repo merges or b) do that yourself. The error means > > that on a branch there's more than one head (i.e. childless > > revision). There's no equivalent concept in git which is why I don't > > know what to do. Generating fake branch names for git may be a little > > messy I think. > I disagree... The worst solution is to stop working at all. A better > solution would be to ignore the unnamed head, and the best solution would > probably be to generate ref names that are _not_ branch names for such > heads. Both solutions require refactoring and new code that is abled to walk the DAG mercurial gives us since in both cases we'd need to find the fork point. I don't know mercurials good enough to say if and how much its API can help here. I don't use git any longer and do only fix obvious breakages for hg-fast-export, read: since this is a new feature I'm afraid I won't implement it. Rocco