From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kip Macy Subject: Re: hg 0.7 released Date: Tue, 20 Sep 2005 18:07:34 -0700 Message-ID: References: <200509161628.35324.hollisb@us.ibm.com> Reply-To: kip.macy@gmail.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2017897974==" Return-path: In-Reply-To: <200509161628.35324.hollisb@us.ibm.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Hollis Blanchard Cc: xen-devel@lists.xensource.com, mercurial@selenic.com List-Id: xen-devel@lists.xenproject.org --===============2017897974== Content-Type: multipart/alternative; boundary="----=_Part_11775_24865294.1127264854755" ------=_Part_11775_24865294.1127264854755 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline nifty - but 0.7 is not backward compatible with 0.6b: %hg clone http://xenbits.xensource.com/xen-unstable.hg=20 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@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= =20 2010, in run sys.exit(dispatch(sys.argv[1:])) File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line= =20 2150, in dispatch return d() File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line= =20 2137, in d =3D lambda: func(u, *args, **cmdoptions) File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line= =20 668, in clone update(ui, repo) File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line= =20 1746, in update return repo.update(node, allow=3Dmerge, force=3Dclean) File "/usr/local/lib/python2.4/site-packages/mercurial/localrepo.py", line= =20 1028, in update pa =3D self.changelog.ancestor(p1, p2) File "/usr/local/lib/python2.4/site-packages/mercurial/revlog.py", line 427= ,=20 in ancestor dist[n] =3D max(dist[p1], dist[p2]) + 1 KeyError: 'cfBc2a2a12bd6ver.\n\x00\x00' On 9/16/05, Hollis Blanchard wrote: >=20 > For Xen developers: >=20 > hg 0.7 was just released today. Here is a summary of the changes: > http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew >=20 > If you're a Xen developer, please upgrade to 0.7. Merges with older=20 > 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=20 > these. >=20 > Also, there were a bunch of rename and copy fixes made, which I guess we= =20 > use a > lot. >=20 > -- > Hollis Blanchard > IBM Linux Technology Center >=20 > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel > ------=_Part_11775_24865294.1127264854755 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline nifty - but 0.7 is not backward compatible with 0.6b:
%hg clone http://x= enbits.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= @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 =3D 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=3Dmerge, force=3Dclean)   File "/usr/local/lib/python2.4/site-packages/mercurial/localrep= o.py", line 1028, in update
    pa =3D self.changelog.ancestor(p1, p2)
  File "/usr/local/lib/python2.4/site-packages/mercurial/revlog.p= y", line 427, in ancestor
    dist[n] =3D max(dist[p1], dist[p2]) + 1
KeyError: 'cfBc2a2a12bd6ver.\n\x00\x00'


On 9/16/05, Hollis Blanchard <holl= isb@us.ibm.com> wrote:
For Xen developers:

hg 0.7 was just released today. Here is a summar= y 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:
  &n= bsp;     local changed xen/arch/ia64/xenasm.S whic= h remote deleted
... when I did not change=20 xenasm.S at all. In general I've seen a lot of
"merge?" messag= es on xen-commit; the improved merge logic may reduce these.

Also, t= here 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@lists.xensou= rce.com
http://lists.xenso= urce.com/xen-devel

------=_Part_11775_24865294.1127264854755-- --===============2017897974== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --===============2017897974==--