Hello!

Kyle Nitzsche kyle.nitzsche at canonical.com
Mon Mar 15 16:28:57 UTC 2010


Vikram Dhillon wrote:
> On Sat, Mar 13, 2010 at 07:19:44PM -0800, Robert Wall wrote:
>   
>> # Bazaar merge directive format 2 (Bazaar 0.90)
>> # revision_id: robertwall at ubuntu.com-20100314025145-q52tfxy8s0r3r4u6
>> # target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
>> #   doc/xubuntu-docs/lucid/
>> # testament_sha1: 2f9475e1e464a4cfda7dda21200d65ca8adb9fce
>> # timestamp: 2010-03-13 18:55:15 -0800
>> # base_revision_id: cody.somerville at canonical.com-20091022040142-\
>> #   k128ehpezq2bq9dh
>> # 
>> # Begin patch
>> === modified file 'desktop-guide/add-applications/C/add-applications.xml'
>> --- desktop-guide/add-applications/C/add-applications.xml	2009-03-31 22:25:25 +0000
>> +++ desktop-guide/add-applications/C/add-applications.xml	2010-03-14 02:51:45 +0000
>> @@ -395,8 +395,8 @@
>>          <procedure>
>>              <step>
>>              <para>
>> -            Press <menuchoice><guimenuitem>System</guimenuitem>
>> -            <guimenuitem>Administration</guimenuitem>
>> +            Press <menuchoice><guimenuitem>Applications</guimenuitem>
>> +            <guimenuitem>System</guimenuitem>
>>              <guimenuitem>Software Sources</guimenuitem>
>>              </menuchoice>.
>>              </para> 
>>
>> # Begin bundle
>> IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdi6xuEAAYPfgABQWGP/93oE
>> WIC////wUAOVaiLenWOxgSSI0Gknik/U8Rom1NR6NTNCZPSZHlBkgU9GFPRqTanoTTRoaDQBkAEk
>> QQp7SEwm1GQaBoxABoAwAAAAGgAAAAASShpomJo09Jomj1Bp6I00B6gDRQrgfXNmFUZfeGZssQBb
>> VVtrF2RBUM/CNN0ECJ7eQ4sg9nRKnM1Hvd50Uu9+frP7WfLfTBy6sa7H49fenMjSt8uM5xBGNxvF
>> NZ18uNDVgOE1SAsJYBA0v3CLdEXApqiukBRSysLXDhTRGTizVizhBVKqbLBNKSiviD1igPGRGlwO
>> zfM0zjHRcxbHsAfsK605GKrkB4HIYAzW+luXb0uUvBrbi/Joz4qDTUK9qFJS3yHUgiptTS6nkeoT
>> XlbYbYJsGKCKvpWC0W61S8KhDvOzT24SxS0lV04l1go5KCcVEy0Zh1ui4o5uSAUbArqCtsiCpU3K
>> JmDClwpFwe8I2utenVIxO0aAhsaBW7kna244hYsutNguhOEIFoD5wDmz7Ctbn0Cgw7QZGYXIm2Qn
>> hqgiCIfgZ8wseE+HTkjaEZWDLVHUUGKKOwvIsCqtnx9ezd4PqNmPA2U625/KhJkwcaVLYDMN7an/
>> rlZJYTtCytwW+kgwP+33MjpkcZCN97UZ6OAODj9c0rLJZQ3HQdz8yLxmlRwweQ2+E+8iu8gNiv4g
>> doauHgT5j+wqyD4BhU6cnvg7QHokNZtLy3b4klBRFQXU6mRUEhBGC2HbDQizxN9ZqdhSuWmKgtnf
>> u3VBTg21S4AWSyv3z4Kamm86Nkr0x7lC4iY/ShzA6s7ZV0oS4LsqHjBMnQWrXW4uLTrfsyKj42+W
>> O1nE2bWikrR5E5JA0hqJm91wTudVppjXUG1Fccef+TS0kFeG4JC0zBlj9IaJIA5E4ThfJZFCtNnW
>> cHOVwWhsnB0YMlrGBr0SlbJRhU7UI4qZEWtPutnBwWuYb/5SrmdiqIk2LJxCGpxwzwUQgi5EmWIB
>> hOU+mlc7Etjag6SuSMQagN+sHImPzEKl01vVujG/BmTOJLFMLsDpfPapsRcFNiuAsxQCWiFzI+Y9
>> 1pHdSvA9hpt2ELppxmSGWvtf3J64iaeWXOJg0cwZ66/MJl+PRpuqibAys1IUaTfiKYhkoLJEPyBS
>> ErKhgIksIqQMRZcUtDsQYH9QFGaRUBAKQNu5XKRQoE8qBqxb4aCYMP8XckU4UJDYusbh
>>     
>
> Hi Robert,
>           Nice job with the patch, and it looks alright to me (just a suggestion, it may just be my preference, next time attach the patch as a seprate file so its easy just to download the attachment and then apply it) now you should attach this patch to the bug report, and that will do the job :) Thanks again for your contribution. 
>   
>   
Hi,

Have you folks considered using bzr merge proposals?  Nice feature. You 
can upload a branch with your changes under your user name and make a 
"merge proposal" against a target bzr branch, for example lp:$project_trunk

Then the reviewer can easily ID changes and deal with them.

Cheers,
Kyle




More information about the ubuntu-doc mailing list