Full files in changesets?

Aaron Bentley aaron.bentley at utoronto.ca
Tue Apr 19 23:44:01 BST 2005


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
| That is, there's no need to patch using only diff context.
|
| (I've been using the term "exact patch" for when the patch arrives
| before any other changes have been made after the revision it patches,
| so THIS=BASE, and it perfectly fits in.)

With diff patches, it's easy to do exact patching, because there are
line numbers, and if it doesn't match, you know you're doing inexact
patching.  Exact patching with diff3 (when BASE or OTHER == THIS) is
equivalent to copying.  So that's why I think of diff3 as being
incapable of doing exact patching.  Fuzzy thinking on my part, I guess.

|>*It's not actually necessary to include the full text of *both* files.
|>A full copy of one, plus a patch to transform it into the other would
|>suffice.
|
|
| Taking this one step further: all we need is the patch and the id of the
| basis revision,
...
|  In this case here they will send a patch
| relative to some previous revision of my mainline, and all they need to
| do is identify that.

That makes all kinds of sense.  Especially for the "submitting a patch
to the mainline" case.

| A sketch of the format:
|
| ## bzr annotated diff

Maybe "## bzr annotated diff 1 0", just to make future changes easy.
Otherwise, looks good.  I'm glad it won't use XML.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCZYmw0F+nu1YWqI0RAnIAAJ0dQazssauc+pjgmXqJGl/RVGy2FgCeKn5a
L7Dk5d4CKnPSNSaOQAmsv0M=
=idFL
-----END PGP SIGNATURE-----




More information about the bazaar mailing list