Rev 2479: Some small reST cleanups in http://bzr.arbash-meinel.com/branches/bzr/HACKING
John Arbash Meinel
john at arbash-meinel.com
Wed May 2 16:56:43 BST 2007
At http://bzr.arbash-meinel.com/branches/bzr/HACKING
------------------------------------------------------------
revno: 2479
revision-id: john at arbash-meinel.com-20070502155640-uedjawljuqyvsz4n
parent: john at arbash-meinel.com-20070502153939-kgauv3msq1uaafq7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: HACKING
timestamp: Wed 2007-05-02 10:56:40 -0500
message:
Some small reST cleanups
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
-------------- next part --------------
=== modified file 'HACKING'
--- a/HACKING 2007-05-02 04:43:27 +0000
+++ b/HACKING 2007-05-02 15:56:40 +0000
@@ -106,14 +106,14 @@
changes visible to users or plugin developers. Please include a diff
against mainline if you're giving a link to a branch.
-You can generate a bundle like this:
+You can generate a bundle like this::
bzr bundle > mybundle.patch
A .patch extension is recommended instead of .bundle as many mail clients
will send the latter as a binary file. If a bundle would be too long or your
mailer mangles whitespace (e.g. implicitly converts Unix newlines to DOS
-newlines), use the merge-directive command instead like this:
+newlines), use the merge-directive command instead like this::
bzr merge-directive http://bazaar-vcs.org http://example.org/my_branch > my_directive.patch
@@ -183,7 +183,9 @@
As a starting suggestion though:
* create a local copy of the main development branch (bzr.dev) by using
- this command: bzr branch http://bazaar-vcs.org/bzr/bzr.dev/ bzr.dev
+ this command::
+
+ bzr branch http://bazaar-vcs.org/bzr/bzr.dev/ bzr.dev
* keep your copy of bzr.dev prestine (by not developing in it) and keep
it up to date (by using bzr pull)
@@ -653,9 +655,9 @@
0. OK.
1. Conflicts in merge-like operations, or changes are present in
- diff-like operations.
+ diff-like operations.
2. Unrepresentable diff changes (i.e. binary files that we cannot show
- a diff of).
+ a diff of).
3. An error or exception has occurred.
Errors are handled through Python exceptions. Exceptions should be defined
@@ -944,4 +946,5 @@
http://bazaar-vcs.org/BzrWin32Installer
-:: vim: ft=rst tw=74 ai
+..
+ vim: ft=rst tw=74 ai
More information about the bazaar-commits
mailing list