Rev 1504: Merge formatting fixes. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

Jelmer Vernooij jelmer at samba.org
Tue Jul 29 03:31:32 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1504
revision-id: jelmer at samba.org-20080729023130-3pg7jnvfpenoobba
parent: jelmer at samba.org-20080728225642-51rt81xv71qb9thf
parent: jelmer at samba.org-20080724184634-5frrera3vygh2m6m
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2008-07-29 04:31:30 +0200
message:
  Merge formatting fixes.
modified:
  FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
    ------------------------------------------------------------
    revno: 1434.1.2
    revision-id: jelmer at samba.org-20080724184634-5frrera3vygh2m6m
    parent: jelmer at samba.org-20080705182448-tykr98yy553g1qbz
    parent: jelmer at samba.org-20080723204518-r32bj14btyztutir
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-07-24 20:46:34 +0200
    message:
      Merge trunk.
    added:
      HACKING                        hacking-20080708205120-2zt6hljftpjuilig-1
      INSTALL                        install-20080708203223-nbfwz4aneslpdz5g-1
      log.py                         log.py-20080707143400-mxzjdllay5jhvnq1-1
      tests/test_delta.py            test_delta.py-20080710120654-bqapu1ccex72nwdk-1
      tests/test_log.py              test_log.py-20080707150233-jwwy10h0byik6jxj-1
      wiki.py                        wiki.py-20080708205255-vpo68letts9127kb-1
    modified:
      AUTHORS                        AUTHORS-20060508114718-4c90c0062645106d
      FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      README                         README-20051120210643-bd274a2fef9aed6a
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
      branchprops.py                 branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      config.py                      config.py-20070624185721-0j8f1ly75uo4s1lk-1
      editor.c                       editor.c-20080602191336-frj7az1sdk13o1tw-1
      errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
      mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
      mapping3/scheme.py             scheme.py-20060516195850-95181aae6b272f9e
      parents.py                     parents.py-20080505192113-5rcif033d6wcam9w-1
      properties.py                  util.py-20080502170127-o220e9py99vt69s6-1
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
      remote.py                      format.py-20060406233823-b6fa009fe35dfde7
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
      setup.py                       setup.py-20060502115218-86950492da22353f
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
      tests/test_blackbox.py         test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
      tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
      tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
      tests/test_config.py           test_config.py-20070624193244-itvnst60evjidr4z-1
      tests/test_convert.py          test_convert.py-20060705203611-b1l0bapeku6foco0-1
      tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
      tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
      tests/test_logwalker.py        test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
      tests/test_properties.py       test_properties.py-20080703215223-t5ydp87wwi7dtyas-1
      tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
      tests/test_repository.py       test_repos.py-20060508151940-ddc49a59257ca712
      tests/test_scheme.py           test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
      tests/test_transport.py        test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
      tests/test_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
      tests/test_versionedfiles.py   test_versionedfiles.-20080626153242-v0c6uolklpux67a1-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
      util.c                         util.c-20080531154025-s8ef6ej9tytsnkkw-1
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
      wc.c                           wc.pyx-20080313142018-10l8l23vha2j9e6b-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1434.1.1
    revision-id: jelmer at samba.org-20080705182448-tykr98yy553g1qbz
    parent: jelmer at samba.org-20080705181721-dpj4qdt7ocnrohmy
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2008-07-05 20:24:48 +0200
    message:
      Formatting fixes.
    modified:
      FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
=== modified file 'FAQ'
--- a/FAQ	2008-07-08 22:52:01 +0000
+++ b/FAQ	2008-07-24 18:46:34 +0000
@@ -40,8 +40,9 @@
 
 The Bazaar revno's differ from the Subversion revno's
 -----------------------------------------------------
-That's right. Bazaar revision numbers are per-branch, whereas Subversion revno's are per-repository. If you 
-would like to use Subversion revision numbers, use the "svn:" revision specifier. For example:
+That's right. Bazaar revision numbers are per-branch, whereas Subversion 
+revno's are per-repository. If you would like to use Subversion revision 
+numbers, use the "svn:" revision specifier. For example:
 
 ::
 
@@ -104,9 +105,9 @@
 
 It is possible to push changes to Subversion without
 setting that metadata by using the ``bzr dpush`` command. 
-Since revisions created in Subversion this way are actually (slightly) different 
-from the matching revisions in the local branch, it is necessary for the dpush command 
-to rebase your branch to the remote branch after pushing.
+Since revisions created in Subversion this way are actually (slightly) 
+different from the matching revisions in the local branch, it is necessary for 
+the dpush command to rebase your branch to the remote branch after pushing.
 
 You would get a DivergedBranches error when pulling from a svn branch you have 
 just pushed to. 




More information about the bazaar-commits mailing list