Two suggestions:<br><br>(a) make a local branch of Dav's branch and downgrade it, then pull from that (or push it back to Launchpad under a different name), or<br><br>(b) diff and patch.<br><br clear="all">-Ken<br>
<br><br><div class="gmail_quote">On Mon, Jan 18, 2010 at 2:51 AM, Fernando Perez <span dir="ltr"><<a href="http://fperez.net">fperez.net</a>@<a href="http://gmail.com">gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Hi folks,<br>
<br>
I needed to test how things would go with a temporary merge of trunk,<br>
my trunk-dev and Dav's branch:<br>
<br>
<a href="https://code.launchpad.net/%7Eipython-contrib/ipython/traitlets-rename" target="_blank">https://code.launchpad.net/~ipython-contrib/ipython/traitlets-rename</a><br>
<br>
which is essentially everything we have in flight right now, but it<br>
seems we have a problem. Dav started with a more updated bzr on his<br>
system, so his branch uses a new repo format, and I can't simply keep<br>
it in the same shared repo as the others, merge, etc:<br>
<br>
maqroll[repo]> bzr branch lp:~ipython-contrib/ipython/traitlets-rename<br>
bzr: ERROR: KnitPackRepository('file:///home/fperez/ipython/repo/.bzr/repository/')<br>
is not compatible with<br>
RemoteRepository(bzr+ssh://<a href="http://bazaar.launchpad.net/%7Eipython-contrib/ipython/traitlets-rename/.bzr/" target="_blank">bazaar.launchpad.net/~ipython-contrib/ipython/traitlets-rename/.bzr/</a>)<br>
different rich-root support<br>
<br>
<br>
There are tons of reports about this, here's one example:<br>
<br>
<a href="https://bugs.launchpad.net/bzr/+bug/450147" target="_blank">https://bugs.launchpad.net/bzr/+bug/450147</a><br>
<br>
I tried running upgrade on my local repo, and now I can pull Dav's<br>
branch, but I can't push anymore:<br>
<br>
maqroll[0.11-tmp]> bzr push --remember lp:~fdo.perez/ipython/0.11-tmp<br>
Using default stacking branch /~ipython-dev/ipython/trunk at<br>
lp-64843152:///~fdo.perez/ipython<br>
bzr: ERROR: KnitPackRepository('lp-64843152:///~ipython-dev/ipython/trunk/.bzr/repository')<br>
is not compatible with<br>
CHKInventoryRepository('lp-64843152:///~fdo.perez/ipython/0.11-tmp/.bzr/repository')<br>
different rich-root support<br>
<br>
<br>
Now I could issue lp commands and upgrade the repos in lp itself, but<br>
that's going to cascade to everyone else, so I don't want to do that<br>
without further feedback.<br>
<br>
It's nuts that bzr would make a change like this with such a nasty<br>
cascading effect...<br>
<br>
Ideas from the experts? (I know, I want to switch to git too so we can<br>
get off the mess that is bzr and its never ending stream of weird<br>
problems, but that's probably too disruptive for now, so let's stick<br>
to solutions that use bzr...)<br>
<br>
Thanks,<br>
<br>
f<br>
<br>
ps - it's not Dav's fault; anyone new contributor starting fresh would<br>
end up in this situation.<br>
_______________________________________________<br>
IPython-user mailing list<br>
<a href="mailto:IPython-user@scipy.org">IPython-user@scipy.org</a><br>
<a href="http://mail.scipy.org/mailman/listinfo/ipython-user" target="_blank">http://mail.scipy.org/mailman/listinfo/ipython-user</a><br>
</blockquote></div><br>