[MERGE] corrected some typos in the users-guide

[Viktor Nagy]

Hi,

I simply ran bzr send -o ~/mychange.patch as written at
http://bazaar-vcs.org/BzrGivingBack

I did it in the docs/en/users-guide directory, I've tried it again,
but it gave the same output as attached

for your convenience, I've set the public_branch setting as well

the attach mydiff.patch flie is a simple diff as generated by olive

I hope this helps

Cheers,
V



2008/7/11 Aaron Bentley <aaron at aaronbentley.com>:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> James Westby wrote:
>> On Wed, 2008-07-09 at 21:26 +0200, Viktor Nagy wrote:
>> Thanks for working on this. Unfortunately I can't review your
>> work as you managed to generate an empty merge directive. Could
>> you tell us how you generated it so that we can work out what
>> went wrong? Did you commit your changes before "bzr send"? One
>> thing to note is that in general you don't want to use "-r"
>> arguments to "bzr send", if you did this then that may well
>> be the cause.
>
> No, this is not accurate.  Use -r freely.  Use it to ensure that the
> diff shown by the merge directive should always reflect the change you
> want to apply.
>
> The /submit_branch/ controls the contents of the bundle.  Specifically,
> send ensures that the bundle contains all the revisions that aren't
> present in the submit_branch.  (i.e. anything that's not an ancestor of
> the submit_branch's tip).
>
> Aaron
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.6 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
>
> iD8DBQFId01i0F+nu1YWqI0RAl8qAJ9ZFDpXy3wsPZSeECp4QSRUJURa6QCcDvov
> Q4rUsrDXFtRRhyoNx0Se93U=
> =ufqj
> -----END PGP SIGNATURE-----
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mychange.patch
Type: text/x-diff
Size: 596 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080714/37447a8b/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mydiff.patch
Type: text/x-diff
Size: 522 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080714/37447a8b/attachment-0001.bin