trouble with apply-changeset
John A Meinel
john at arbash-meinel.com
Sun Jul 10 15:54:17 BST 2005
Robey Pointer wrote:
> 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. :)
Well, I've been working harder on making the changeset and being able to
read it back in. Obviously apply-changeset should work eventually. :)
Just to warn you, I'm currently updating "bzr cset" so that it allows
you to specify changesets in a better manner. Specifically you should be
able to supply a changeset against any base, so that the person you send
it to can apply it. This will change how you supply parameters to the
command (instead of "bzr cset -r 10", you will do more "bzr cset BASE
[TARGET]").
This shouldn't effect the changeset format, or the apply-changeset
process too much.
I will review your patch. Thanks for the help. Probably apply cset will
change a little bit. I think apply changeset is just going to install
the inventory and revision XML, and then call merge() to merge the
working directory.
>
> 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 is something dangerous. In general I don't want merge changing line
endings. But if we have to worry about the in-between mailer changing
them, then we probably will need to do something.
>
> 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. :(
I'll look into it, thanks for the help.
>
> robey
John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050710/5b97871a/attachment.pgp
More information about the bazaar
mailing list