trouble with apply-changeset
Robey Pointer
robey at lag.net
Sun Jul 10 09:04:59 BST 2005
Using bzr-changeset at 67, I couldn't get apply-changeset to apply
John's "diff" cset from this afternoon against a clean bzr.dev
branch. It looks like maybe apply-changeset may not even be meant to
be hooked up yet, in which case I'm jumping the gun. :)
Attached is a patch that solves some of the immediate problems
(function parameter mismatches, etc) and a couple of logic problems:
* Directories appear to always have None for a text_size, and
* The ChangesetTree must be iterated top down, or else the new
Inventory fails to build (it wants parents added before children).
Also, "patch" must be called with "-l" (not included in the patch
below) to avoid getting confused about trailing whitespace, which
many mail readers (including mine, apparently) will strip out.
This patch DOES NOT make apply-changeset work: it still fails at the
end due to a mismatched inventory sha1, so something deeper is
wrong. Consider this patch a quickref of bugs I found and potential
fixes for them. I don't understand the code deeply enough to make it
actually work yet. :(
robey
-------------- next part --------------
A non-text attachment was scrubbed...
Name: changeset.patch
Type: application/octet-stream
Size: 2467 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050710/4bf66572/attachment.obj
More information about the bazaar
mailing list