[Xen-devel] hg 0.7 released

Kip Macy kip.macy at gmail.com
Tue Sep 20 20:07:34 CDT 2005


nifty - but 0.7 is not backward compatible with 0.6b:
%hg clone http://xenbits.xensource.com/xen-unstable.hg 
requesting all changes
adding changesets
adding manifests
adding file changes
added 6917 changesets with 0 changes to 0 files
** unknown exception encountered, details follow
** report bug details to mercurial at selenic.com
Traceback (most recent call last):
File "/usr/local/bin/hg", line 13, in ?
commands.run()
File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line 
2010, in run
sys.exit(dispatch(sys.argv[1:]))
File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line 
2150, in dispatch
return d()
File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line 
2137, in <lambda>
d = lambda: func(u, *args, **cmdoptions)
File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line 
668, in clone
update(ui, repo)
File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line 
1746, in update
return repo.update(node, allow=merge, force=clean)
File "/usr/local/lib/python2.4/site-packages/mercurial/localrepo.py", line 
1028, in update
pa = self.changelog.ancestor(p1, p2)
File "/usr/local/lib/python2.4/site-packages/mercurial/revlog.py", line 427, 
in ancestor
dist[n] = max(dist[p1], dist[p2]) + 1
KeyError: 'cfBc2a2a12bd6ver.\n\x00\x00'


On 9/16/05, Hollis Blanchard <hollisb at us.ibm.com> wrote:
> 
> For Xen developers:
> 
> hg 0.7 was just released today. Here is a summary of the changes:
> http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew
> 
> If you're a Xen developer, please upgrade to 0.7. Merges with older 
> versions
> of hg are causing problems like this for me:
> local changed xen/arch/ia64/xenasm.S which remote deleted
> ... when I did not change xenasm.S at all. In general I've seen a lot of
> "merge?" messages on xen-commit; the improved merge logic may reduce 
> these.
> 
> Also, there were a bunch of rename and copy fixes made, which I guess we 
> use a
> lot.
> 
> --
> Hollis Blanchard
> IBM Linux Technology Center
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel at lists.xensource.com
> http://lists.xensource.com/xen-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.selenic.com/pipermail/mercurial/attachments/20050920/dcbb65e1/attachment.html


More information about the Mercurial mailing list