[svnbook commit] r1438 - in trunk/src/ru: . book

dmitriy svnbook-dev at red-bean.com
Sat Jun 11 06:17:32 CDT 2005


Author: dmitriy
Date: Sat Jun 11 06:17:31 2005
New Revision: 1438

Modified:
   trunk/src/ru/LAST_UPDATED
   trunk/src/ru/book/ch02.xml
   trunk/src/ru/book/ch03.xml
   trunk/src/ru/book/ch05.xml
   trunk/src/ru/book/ch06.xml
   trunk/src/ru/book/ch09.xml
   trunk/src/ru/sync.py
Log:
Checking work of 'sync.py'. It work!

* sync.py
  Fixing first bug

* LAST_UPDATED
* book/ch02.xml
* book/ch03.xml
* book/ch05.xml
* book/ch06.xml
* book/ch09.xml
  Are merged with en/


Modified: trunk/src/ru/LAST_UPDATED
==============================================================================
--- trunk/src/ru/LAST_UPDATED	(original)
+++ trunk/src/ru/LAST_UPDATED	Sat Jun 11 06:17:31 2005
@@ -1 +1 @@
-1420
\ No newline at end of file
+1437
\ No newline at end of file

Modified: trunk/src/ru/book/ch02.xml
==============================================================================
--- trunk/src/ru/book/ch02.xml	(original)
+++ trunk/src/ru/book/ch02.xml	Sat Jun 11 06:17:31 2005
@@ -498,7 +498,7 @@
         <para>The copy-modify-merge model is based on the assumption
           that files are contextually mergeable: that is, that the
           majority of the files in the repository are line-based text
-          files (such as program source code.)  But for files with
+          files (such as program source code).  But for files with
           binary formats, such as artwork or sound, it's often
           impossible to merge conflicting changes.  In these
           situations, it really is necessary to users to take strict

Modified: trunk/src/ru/book/ch03.xml
==============================================================================
--- trunk/src/ru/book/ch03.xml	(original)
+++ trunk/src/ru/book/ch03.xml	Sat Jun 11 06:17:31 2005
@@ -1482,7 +1482,7 @@
 
         <para>The third column will only show whitespace or an
           <computeroutput>L</computeroutput> which means that
-          Subversion has locked the direcotry's
+          Subversion has locked the directory's
           <filename>.svn</filename> working area.  You will see an
           <computeroutput>L</computeroutput> if you run <command>svn
           status</command> in a directory where an <command>svn

Modified: trunk/src/ru/book/ch05.xml
==============================================================================
--- trunk/src/ru/book/ch05.xml	(original)
+++ trunk/src/ru/book/ch05.xml	Sat Jun 11 06:17:31 2005
@@ -808,13 +808,13 @@
               create a more complex policy specifying exactly which
               users are allowed to lock particular paths.  If the hook
               notices a pre-existing lock, then it can also decide
-              whether a user is allowed to "steal" the existing lock.
-              The repository passes three arguments to the hook: the
-              path to the repository, the path being locked, and the
-              user attempting to perform the lock.  If the program
-              returns a non-zero exit value, the lock action is
-              aborted and anything printed to stderr is marshalled
-              back to the client.</para>
+              whether a user is allowed to <quote>steal</quote> the
+              existing lock.  The repository passes three arguments to
+              the hook: the path to the repository, the path being
+              locked, and the user attempting to perform the lock.  If
+              the program returns a non-zero exit value, the lock
+              action is aborted and anything printed to stderr is
+              marshalled back to the client.</para>
           </listitem>
         </varlistentry>
 
@@ -1356,7 +1356,7 @@
           </varlistentry>
 
           <varlistentry>
-            <term><literal>lstxns</literal></term>
+            <term><literal>lslocks</literal></term>
             <listitem>
               <para>List and describe any locks that exist in the
                 repository.</para>

Modified: trunk/src/ru/book/ch06.xml
==============================================================================
--- trunk/src/ru/book/ch06.xml	(original)
+++ trunk/src/ru/book/ch06.xml	Sat Jun 11 06:17:31 2005
@@ -261,7 +261,7 @@
 $ svn commit -F new_msg.txt
 Authentication realm: <svn://host.example.com:3690> example realm
 Username:  joe
-[...]
+…
 </screen>
 
       <para>Or, if you want to disable credential caching permanently,

Modified: trunk/src/ru/book/ch09.xml
==============================================================================
--- trunk/src/ru/book/ch09.xml	(original)
+++ trunk/src/ru/book/ch09.xml	Sat Jun 11 06:17:31 2005
@@ -583,7 +583,7 @@
 A         foo.c
 A         somedir/bar.c
 A         otherdir/docs/baz.doc
-[...]
+…
 </screen>
 
         </refsect1>

Modified: trunk/src/ru/sync.py
==============================================================================
--- trunk/src/ru/sync.py	(original)
+++ trunk/src/ru/sync.py	Sat Jun 11 06:17:31 2005
@@ -62,6 +62,7 @@
             cmd = "svn merge" + " -r " + last_up_rev + ":" + "HEAD" + " " + \
                   book_src_url
             print cmd
+            os.system(cmd)
             os.chdir("..")
             os.system("svnversion . --no-newline > LAST_UPDATED")
         sys.exit()



More information about the svnbook-dev mailing list