WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

Re: [Xen-devel] hg 0.7 released

To: Hollis Blanchard <hollisb@xxxxxxxxxx>
Subject: Re: [Xen-devel] hg 0.7 released
From: Kip Macy <kip.macy@xxxxxxxxx>
Date: Tue, 20 Sep 2005 18:07:34 -0700
Cc: xen-devel@xxxxxxxxxxxxxxxxxxx, mercurial@xxxxxxxxxxx
Delivery-date: Wed, 21 Sep 2005 01:05:18 +0000
Domainkey-signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:references; b=X+HmxktR+tXnc+MXqZRCBJACwAtVmt+NbFN5FCpXlrvticF73Esjzl1WGvtQDU33nAmk6EsvcdGMrXA+WCU2dCk6HXnRB0VOIRZKgFLT3zDuVZvCIPrxmNKC4hJ16F/jnLT+2voknIWgG8o7IW2pxSLvQQ7bLMcGoYJGA6xNUpw=
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <200509161628.35324.hollisb@xxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <200509161628.35324.hollisb@xxxxxxxxxx>
Reply-to: kip.macy@xxxxxxxxx
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
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@xxxxxxxxxxx
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@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
<Prev in Thread] Current Thread [Next in Thread>