-
Notifications
You must be signed in to change notification settings - Fork 47
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
error pushing new branches to launchpad #30
Comments
this is the longest lived bug ever, it is currently in some progress from the bzr side, but i don't know what the timeline is: https://bugs.launchpad.net/bzr/+bug/541626 If you turn on debug in git-bzr (uncomment https://github.com/termie/git-bzr-ng/blob/master/git-bzr#L698 ) it should dump out the contents of the map files, which can help me debug, if i can at least get a reproducible test case i might be able to make some progress |
debug output from git-bzr |
hrm, maybe what i really need to do is get more debugging into python-fastimport |
I encountered the same and couldn't proceed. I ended up creating the branch on bzr and importing it to git with |
perhaps related |
that gist is usually the result of not having a parent branch, git-bzr-ng defaults to the bzr branch associated with master, but if you're actually branched from something that is not coming from master then you sometimes need to specify the parent (I tried to come up with a way to guess which branch is most appropriate but it proved pretty unreliable) Usage: git bzr push Effectively a bzr push Options: In can also come up if you've done significant rebases, the usual solution to which is git bzr clear and then git bzr push --overwrite lp:~name/stuff/things |
ah. thanks. unfortunately, trying to push it up gives me the original error (AttributeError: 'BTreeBuilder' object has no attribute '_find_ancestors') |
so, i am beginning to find a pattern (just did some nova work again so was using this)... here's what I do and maybe you can confirm that you've done similar i do a checkout of nova done with git bzr clone lp:nova later on some changes have landed in trunk, so i do a git bzr pull to get the new changes do a fresh checkout of nova, fetch the branch from the first checkout into it and rebase on master, push... and it works |
... ergo, something about pulling in new data creates intractable situations, for a long time i've felt that bzr or lp was changing commit ids on me, something related to the merge commits it does... i feel like they can get new sub-commits or something that triggers some git arrangement that triggers some search for this fabled "ancestor"... just thinking out loud here |
Same Problem here for me. Is there still a known workaround? Using bzr 2.3.0 did not help resolving the issue for me (this is mentioned in the README) |
The text was updated successfully, but these errors were encountered: