[Bug 4811] New: hg pull failed when heads are obsolete

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=4811

          Priority: normal
            Bug ID: 4811
                CC: mercurial-devel at selenic.com,
                    pierre-yves.david at ens-lyon.org
          Assignee: bugzilla at selenic.com
           Summary: hg pull failed when heads are obsolete
          Severity: bug
    Classification: Unclassified
                OS: Windows
          Reporter: nicolas.rozain at external.gdfsuez.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: stable branch
         Component: evolution
           Product: Mercurial

Created attachment 1855
  --> http://bz.selenic.com/attachment.cgi?id=1855&action=edit
Output of 'hg pull'

In a clone of a repository, I have one branch with 2 headers (same parent),
each with one commit only. These commits are the same except they have
different changesets.

On the server, I have the same commit as head, but with again a different
changeset.

When I perform a pull request, it fails and return 255.

I am not aware of the use of this repository but I guess that the commit was
rebased several times, and that the clone pulled it between each rebase. And
the pull failed the second time...

Here is my config:
Server:
* Mercurial v3.1.2
* mutable-history: tag 5.1.0

Client:
* Mercurial v3.3
* mutable-history: tag 5.2.0

Please find attached the log of the error.

Thanks for your help,

Nicolas

-- 
You are receiving this mail because:
You are on the CC list for the bug.