From: Kip Macy <kip.macy@gmail.com>
To: Hollis Blanchard <hollisb@us.ibm.com>
Cc: xen-devel@lists.xensource.com, mercurial@selenic.com
Subject: Re: hg 0.7 released
Date: Tue, 20 Sep 2005 18:07:34 -0700 [thread overview]
Message-ID: <b1fa29170509201807329d3156@mail.gmail.com> (raw)
In-Reply-To: <200509161628.35324.hollisb@us.ibm.com>
[-- Attachment #1.1: Type: text/plain, Size: 2254 bytes --]
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@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@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@lists.xensource.com
> http://lists.xensource.com/xen-devel
>
[-- Attachment #1.2: Type: text/html, Size: 3238 bytes --]
[-- Attachment #2: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
next prev parent reply other threads:[~2005-09-21 1:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-16 21:28 hg 0.7 released Hollis Blanchard
2005-09-21 1:07 ` Kip Macy [this message]
2005-09-21 1:14 ` [Xen-devel] " Matt Mackall
2005-09-21 1:19 ` Kip Macy
2005-09-21 1:27 ` Matt Mackall
2005-09-21 1:32 ` Kip Macy
2005-09-21 13:28 ` James Bulpin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b1fa29170509201807329d3156@mail.gmail.com \
--to=kip.macy@gmail.com \
--cc=hollisb@us.ibm.com \
--cc=mercurial@selenic.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.