[BUG] apply_changeset / generate_changeset use wrong base

John A Meinel john at arbash-meinel.com
Tue Sep 27 20:10:54 BST 2005


Aaron Bentley wrote:
> Aaron Bentley wrote:
>
>>>I would actually prefer if by default, it always picked the last commit
>>>in OTHER_BRANCH as the changeset base, because that makes it clearer
>>>what will happen to the target tree if the changeset is applied.
>
>
> I take it back.  Using the common ancestor as the changeset base will
> show the differences most clearly.
>
> Aaron

I think using the common ancestor will show what I have done. While
using the last commit will show what it will do to your tree.

There is a case for both.
However, once you have "bzr apply-changeset <cset>" you can just do "bzr
diff | vim -" to see how the changes apply to your tree.

You could always use a throwaway branch to make sure you don't mess up
the important branch.

So did we ever work out what the new syntax was going to look like? Are
we switching to using the semi-colon syntax? I'm still using the
path/@revno syntax. Actually I'm using bzrlib.commands.parse_spec, so
it's whatever that has evolved into.

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/20050927/a7e0d7d0/attachment.pgp 


More information about the bazaar mailing list