Re: [PATCH] remote-hg: do not fail on invalid bookmarks

From: Antoine Pelisse <apelisse@gmail.com>
Date: Dec 30, 2013, 07:41 UTC
Message-ID: <CALWbr2wYqxdMhaWfXQCOk3J_Mxy6=NcScyg9-__j8PPdhY7reA@mail.gmail.com>
In-Reply-To: <20131229222433.GA31355@glandium.org>

On Sun, Dec 29, 2013 at 11:24 PM, Mike Hommey <mh@glandium.org> wrote:

Show 12 quoted lines

> On Sun, Dec 29, 2013 at 12:30:02PM +0100, Antoine Pelisse wrote:
>> Mercurial can have bookmarks pointing to "nullid" (the empty root
>> revision), while Git can not have references to it.
>> When cloning or fetching from a Mercurial repository that has such a
>> bookmark, the import will fail because git-remote-hg will not be able to
>> create the corresponding reference.
>>
>> Warn the user about the invalid reference, and continue the import,
>> instead of stopping right away.
>
> It's not invalid, it's used to indicate deleted bookmarks. (Tags have
> the same property)

Hey Mike, Indeed, I don't know how I ended-up with such a bookmark, but it prevented me from git-cloning the repository (and the backtrace was not very helpful at first). But I'm still not sure what you mean by "deleted bookmarks" ? I guess it's not "hg bookmark --delete", as it would not be listed at all. Is it "hg strip some_changeset" that end-up deleting the bookmarked changeset ? I think I've tested this use-case and it moved the bookmark to a parent changeset.

Antoine,