[PATCH]: Optional explanation for options

[Robey Pointer]

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


On 20 Sep 2005, at 21:16, John A Meinel wrote:

> Robey Pointer wrote:
>
>> In re checking the per-file hashes or the inventory hash: hopefully
>> those would just be warnings, since applying a cset as a merge could
>> often cause the hashes to be different.
>>
>
> Actually, that's not the way changesets are written. In order to  
> apply a
> changeset, you must have BASE. The changeset describes how to  
> transform
> BASE into TARGET, so that when you are done, you have an exact  
> duplicate
> of the revision being described.
>
> Then that revision is merged against the current revision. This is  
> where
> fuzzy stuff and conflicts come into play.
>
> So actually, the per-file and inventory and revision hashes are all
> strictly enforced. It is just that once installed, the final merge  
> might
> generate a tree which has not existed yet. I hope that makes sense.

Yes, actually.  Thanks. :)

Since this might not be obvious to some users -- it wasn't obvious to  
me until you explained it -- it would be cool if the "cset" command  
could take another branch as an argument, and use the merging code to  
find the common base automatically.  Maybe it already does this (I  
can't check right now because I'm on a train).

In other words:
robey at ralph:code/bzr.dev.robey$ bzr cset --from ../bzr.dev


>
> One of the interesting things, is that BASE can be anything. So I can
> create a changeset of your tree, against mine, or a common  
> ancestor, or
> whatever makes the most sense. The default in the code is to take your
> tree and find the common ancestor, and then produce the changeset that
> will let you generate my tree from the common ancestor.

I don't quite understand this paragraph but you might be saying  
exactly what I'm suggesting above, in which case ignore me.  I've  
been dealing with Microsoft all day and it's left my brain like month- 
old mashed potatoes. :)

robey

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (Darwin)

iD8DBQFDMhAAQQDkKvyJ6cMRAv5PAJ44H6yf2TJX9TpFD+Pcuqlw3DWS1gCgyLn7
VKQoNQjLNglqiDRE6fRlJ/s=
=P+g7
-----END PGP SIGNATURE-----