[MERGE][1.16] Added directory structure and started translation of docs in Russian.
Aaron Bentley
aaron at aaronbentley.com
Wed Jun 10 17:28:46 BST 2009
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Alexander Belchenko wrote:
>> Just one question about merge directive:
>
>> # Bazaar merge directive format 2 (Bazaar 0.90)
>> # revision_id: bialix at ukr.net-20090609095943-22m0k8k0sdk8qfmu
>> # target_branch: lp:bzr
>> # testament_sha1: 852f7316a37434c1bcfb0df544df6ca9719bfe3a
>> # timestamp: 2009-06-09 13:01:44 +0300
>> # source_branch: lp:~ru-bzr/bzr/doc-ru
>> # base_revision_id: pqm at pqm.ubuntu.com-20090609074559-97mi1flqtxzh6aj3
>
>> I see there revision_id line and base_revision_id line.
>> IIUC this info could be used by bzr when someone will try to merge it,
>> right?
Right.
> If this is right, I'm not quite understand why you said:
>
>> "The patch cannot be automatically tracked, because it has no revision
>> identifiers."
I was talking about the patch, not the merge directive. The merge
directive does provide revision identifiers, but you attached a patch
that wasn't part of the merge directive, and that had no revision
identifiers.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkov3z4ACgkQ0F+nu1YWqI1bPwCaA5+ltLL94m+PCsG0ltjvU6Gl
eAcAoIY5xU3f5xhP9Eb2ZTy0RJsik6Xc
=as6r
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list