[svnbook commit] r1576 - in trunk/src/ru: . book
dmitriy
svnbook-dev at red-bean.com
Sat Jul 30 23:44:59 CDT 2005
Author: dmitriy
Date: Sat Jul 30 23:44:58 2005
New Revision: 1576
Modified:
trunk/src/ru/TRANSLATION-STATUS
trunk/src/ru/book/appa.xml
trunk/src/ru/book/appb.xml
trunk/src/ru/book/appc.xml
trunk/src/ru/book/ch00.xml
trunk/src/ru/book/ch01.xml
trunk/src/ru/book/ch02.xml
trunk/src/ru/book/ch03.xml
trunk/src/ru/book/ch04.xml
trunk/src/ru/book/ch05.xml
trunk/src/ru/book/ch06.xml
trunk/src/ru/book/ch07.xml
trunk/src/ru/book/ch08.xml
trunk/src/ru/book/foreword.xml
trunk/src/ru/sync.py
Log:
* ru/TRANSLATION-STATUS: change of status for modified files
* ru/sync.py: added a color output for switch '-l'
* ru/book/appa.xml
* ru/book/appb.xml
* ru/book/appc.xml
* ru/book/foreword.xml
* ru/book/ch00.xml
* ru/book/ch01.xml
* ru/book/ch02.xml
* ru/book/ch03.xml
* ru/book/ch04.xml
* ru/book/ch05.xml
* ru/book/ch06.xml
* ru/book/ch07.xml
* ru/book/ch08.xml
Sync with en/, up to r1575
Modified: trunk/src/ru/TRANSLATION-STATUS
==============================================================================
--- trunk/src/ru/TRANSLATION-STATUS (original)
+++ trunk/src/ru/TRANSLATION-STATUS Sat Jul 30 23:44:58 2005
@@ -49,6 +49,7 @@
interested enough to continue.
book/ch00.xml [svn.preface.acks]
+ book/ch02.xml [svn.basic.in-action.mixedrevs]
2.1.6 Not translated
@@ -74,7 +75,6 @@
These files are ready for editing, translation work is finished on
them for now.
- book/ch02.xml
book/ch03.xml
2.1.8. Editing in progress
Modified: trunk/src/ru/book/appa.xml
==============================================================================
--- trunk/src/ru/book/appa.xml (original)
+++ trunk/src/ru/book/appa.xml Sat Jul 30 23:44:58 2005
@@ -6,7 +6,7 @@
@ENGLISH }}} -->
<title>Subversion для пользователей CVS</title>
<appendixinfo>
- <edition>1563</edition>
+ <edition>1575</edition>
</appendixinfo>
<!-- See also svn.preface.organization -->
Modified: trunk/src/ru/book/appb.xml
==============================================================================
--- trunk/src/ru/book/appb.xml (original)
+++ trunk/src/ru/book/appb.xml Sat Jul 30 23:44:58 2005
@@ -5,7 +5,7 @@
@ENGLISH }}} -->
<title>WebDAV и автоматическое управление версиями</title>
<appendixinfo>
- <edition>1563</edition>
+ <edition>1575</edition>
</appendixinfo>
<!-- See also svn.preface.organization -->
Modified: trunk/src/ru/book/appc.xml
==============================================================================
--- trunk/src/ru/book/appc.xml (original)
+++ trunk/src/ru/book/appc.xml Sat Jul 30 23:44:58 2005
@@ -5,7 +5,7 @@
@ENGLISH }}} -->
<title>Инструменты от сторонних разработчиков</title>
<appendixinfo>
- <edition>1563</edition>
+ <edition>1575</edition>
</appendixinfo>
<!-- See also svn.preface.organization -->
Modified: trunk/src/ru/book/ch00.xml
==============================================================================
--- trunk/src/ru/book/ch00.xml (original)
+++ trunk/src/ru/book/ch00.xml Sat Jul 30 23:44:58 2005
@@ -4,7 +4,7 @@
<title>Preface</title>
@ENGLISH }}} -->
<prefaceinfo>
- <edition>1563</edition>
+ <edition>1575</edition>
</prefaceinfo>
<title>Об этой книге</title>
Modified: trunk/src/ru/book/ch01.xml
==============================================================================
--- trunk/src/ru/book/ch01.xml (original)
+++ trunk/src/ru/book/ch01.xml Sat Jul 30 23:44:58 2005
@@ -6,7 +6,7 @@
@ENGLISH }}} -->
<title>Введение</title>
<chapterinfo>
- <edition>1563</edition>
+ <edition>1575</edition>
<othername id="svn.intro.architecure.dia-1.prepositional-case"
role="title-variant">рисунке 1.1, «Архитектура
Subversion»</othername>
Modified: trunk/src/ru/book/ch02.xml
==============================================================================
--- trunk/src/ru/book/ch02.xml (original)
+++ trunk/src/ru/book/ch02.xml Sat Jul 30 23:44:58 2005
@@ -7,7 +7,7 @@
<title>Основные понятия</title>
<chapterinfo>
<!-- See also svn.preface.organization -->
- <edition>1530</edition>
+ <edition>1575</edition>
<othername id="svn.basic.accusative-case" role="title-variant">главу
2, «Основные понятия»</othername>
</chapterinfo>
@@ -43,9 +43,6 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<!-- ================================================================= -->
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <!-- ================================================================= -->
<sect1 id="svn.basic.repository">
<!-- @ENGLISH {{{
<title>The Repository</title>
@@ -1284,95 +1281,167 @@
<!-- =============================================================== -->
<sect2 id="svn.basic.in-action.mixedrevs">
<!-- @ENGLISH {{{
- <title>The Limitations of Mixed Revisions</title>
+ <title>Mixed Revision Working Copies</title>
@ENGLISH }}} -->
- <title>Ограничения смешанных правок</title>
+ <title>Смешивание правок в рабочих копиях</title>
<!-- @ENGLISH {{{
<para>As a general principle, Subversion tries to be as flexible
as possible. One special kind of flexibility is the ability
- to have a working copy containing mixed revision
- numbers.</para>
+ to have a working copy containing files and directories with a
+ mix of different working revision numbers. Unfortunately,
+ this flexibility tends to confuse a number of new users. If
+ the earlier example showing mixed revisions perplexed you,
+ here's a primer on both why the feature exists and how to make
+ use of it.</para>
@ENGLISH }}} -->
<para>Subversion пытается быть гибкой настолько, насколько это возможно.
В частности, существует возможность иметь рабочую копию, содержащую
- правки смешанных номеров.</para>
+ файлы и директории, имеющие смешаные номера рабочих правок. Но к
+ сожалению эта гибкость, иногда, смущает некоторых новых
+ пользователей. Если раньше примеры, показывающие смешаные правки,
+ вызывали у вас чувство растеряности, то вот вам руководство, которое
+ рассказывает и для чего такая возможность существует и как ее
+ использовать.</para>
+
+ <sect3 id="svn.basic.in-action.mixedrevs.update-commit">
+ <!-- @ENGLISH {{{
+ <title>Updates and Commits are Separate</title>
+ @ENGLISH }}} -->
+ <title>Обновления и фиксации существуют независимо</title>
+
+ <!-- @ENGLISH {{{
+ <para>One of the fundamental rules of Subversion is that
+ a <quote>push</quote> action does not cause
+ a <quote>pull</quote>, nor the other way around. Just
+ because you're ready to submit new changes to the repository
+ doesn't mean you're ready to receive changes from other
+ people. And if you have new changes still in progress,
+ then <command>svn update</command> should gracefully merge
+ repository changes into your own, rather than forcing you to
+ publish them.</para>
+ @ENGLISH }}} -->
+ <para>Одно из фундаментальных правил Subversion заключается в том,
+ что <quote>выталкивающее</quote> действие не приводит к
+ <quote>затаскиванию</quote> и на оборот. Только то, что вы готовы
+ внести изменения в хранилище, не означает, что вы готовы получать
+ изменения от других. А если вы все еще работаете над новыми изменениями,
+ то <command>svn update</command> изящно объединит изменения из
+ хранилища с вашими собственными, вместо того, что бы заставлять вас
+ опубликовать их.</para>
+
+ <!-- @ENGLISH {{{
+ <para>The main side-effect of this rule is that it means a
+ working copy has to do extra bookkeeping to track mixed
+ revisions, and be tolerant of the mixture as well. It's
+ made more complicated by the fact that directories
+ themselves are versioned.</para>
+ @ENGLISH }}} -->
+ <para>Главным побочным эфектом этого правила является то, что
+ рабочей копии необходимо вести дополнительный учет при смешивании
+ правок и быть терпимой к смешиванию вообще. Тот факт, что директории
+ сами по себе являются версионироваными, делает это еще более сложным
+ для понимания.</para>
+
+ <para>For example, suppose you have a working copy entirely at
+ revision 10. You edit the
+ file <filename>foo.html</filename> and then perform
+ an <command>svn commit</command>, which creates revision 15
+ in the repository. After the commit succeeds, many new
+ users would expect the working copy to be entirely at
+ revision 15, but that's not the case! Any number of changes
+ might have happened in the repository between revisions 10
+ and 15. It would be a lie to claim that we had a working
+ copy of revision 15, the client simply doesn't know. If, on
+ the other hand, <command>svn commit</command> were to
+ automatically download the newest changes, then it would be
+ possible to set the entire working copy to revision
+ 15—but then we'd be breaking the fundamental rule
+ of <quote>push</quote> and <quote>pull</quote> remaining
+ separate actions. Therefore the only safe thing the
+ Subversion client can do is mark the one
+ file—<filename>foo.html</filename>—as being at
+ revision 15. The rest of the working copy remains at
+ revision 10. Only by running <command>svn update</command>
+ can the latest changes be downloaded, and the whole working
+ copy be marked as revision 15.</para>
+
+ </sect3>
+
+ <sect3 id="svn.basic.in-action.mixedrevs.normal">
+ <title>Mixed revisions are normal</title>
+
+ <para>The fact is, <emphasis>every time</emphasis> you
+ run <command>svn commit</command>, your working copy ends
+ up with some mixture of revisions. The things you just
+ committed are marked as having larger working revisions
+ than everything else. After several commits (with no
+ updates in-between) your working copy will contain a whole
+ mixture of revisions. Even if you're the only person
+ using the repository, you will still see this phenomenon.
+ To examine your mixture of working revisions, use
+ the <command>svn status --verbose</command> command (see
+ <xref linkend="svn.tour.cycle.examine.status"/> for more
+ information.)</para>
+
+ <para>Often, new users are completely unaware that their
+ working copy contains mixed revisions. This can be
+ confusing, because many client commands are sensitive to
+ the working revision of the item they're examining. For
+ example, the <command>svn log</command> command is used to
+ display the history of changes to a file or directory (see
+ <xref linkend="svn.tour.history.log"/>). When the user
+ invokes this command on a working copy object, they expect
+ to see the entire history of the object. But if the
+ object's working revision is quite old (often
+ because <command>svn update</command> hasn't been run in a
+ long time), then the history of
+ the <emphasis>older</emphasis> version of the object is
+ shown.</para>
+ </sect3>
+
+ <sect3 id="svn.basic.in-action.mixedrevs.useful">
+ <title>Mixed revisions are useful</title>
+
+ <para>If your project is sufficiently complex, you'll
+ discover that it's sometimes nice to forcibly
+ <quote>backdate</quote> portions of your working copy to
+ an earlier revision; you'll learn how to do that in
+ Chapter 3. Perhaps you'd like to test an earlier version
+ of a sub-module contained in a subdirectory, or perhaps
+ you'd like to figure out when a bug first came into
+ existence in a specific file. This is the <quote>time
+ machine</quote> aspect of a version control system —
+ the feature which allows you to move any portion of your
+ working copy forward and backward in history.</para>
+
+ </sect3>
+
+ <sect3 id="svn.basic.in-action.mixedrevs.limits">
+ <title>Mixed revisions have limitations</title>
+
+ <para>However you make use of mixed revisions in your
+ working copy, there are limitations to this
+ flexibility.</para>
+
+ <para>First, you cannot commit the deletion of a file or
+ directory which isn't fully up-to-date. If a newer
+ version of the item exists in the repository, your attempt
+ to delete will be rejected, to prevent you from
+ accidentally destroying changes you've not yet
+ seen.</para>
+
+ <para>Second, you cannot commit a metadata change to a
+ directory unless it's fully up-to-date. You'll learn
+ about attaching
+ <quote>properties</quote> to items in Chapter 6. A
+ directory's working revision defines a specific set of
+ entries and properties, and thus committing a property
+ change to an out-of-date directory may destroy properties
+ you've not yet seen.</para>
+
+ </sect3>
- <!-- @ENGLISH {{{
- <para>At first, it may not be entirely clear why this sort of
- flexibility is considered a feature, and not a liability.
- After completing a commit to the repository, the freshly
- committed files and directories are at a more recent working
- revision than the rest of the working copy. It looks like a
- bit of a mess. As demonstrated earlier, the working copy can
- always be brought to a single working revision by running
- <command>svn update</command>. Why would someone
- <emphasis>deliberately</emphasis> want a mixture of working
- revisions?</para>
- @ENGLISH }}} -->
- <para>По началу может быть непонятным, почему это является
- дополнительной возможностью, а не правилом. После выполнения фиксации
- только что зафиксированные файлы и директории будут иметь более новую
- правку, чем остальная рабочая копия. Это выглядит немного запутанным.
- Как было показано ранее, рабочая копия всегда может быть приведена к
- одной рабочей правке, выполнив <command>svn update</command>.
- Зачем кому-то <emphasis>сознательно</emphasis> перемешивать
- рабочие правки?</para>
-
- <!-- @ENGLISH {{{
- <para>Assuming your project is sufficiently complex, you'll
- discover that it's sometimes nice to forcibly
- <quote>backdate</quote> portions of your working copy to an
- earlier revision; you'll learn how to do that in Chapter 3.
- Perhaps you'd like to test an earlier version of a sub-module,
- contained in a subdirectory, or perhaps you'd like to examine
- a number of previous versions of a file in the context of the
- latest tree.</para>
- @ENGLISH }}} -->
- <para>Допустим, что вы имеете комплексный проект, вы можете обнаружить,
- что иногда выгодно принудительно <quote>возвращать</quote> части
- вашей рабочей копии к более ранним правкам; вы научитесь этому в
- Главе 3. Возможно, вы захотите протестировать более раннюю версию
- субмодуля, находящегося в поддиректории, или вам будет необходимо
- проверить ряд предыдущих версий файла в контексте новой структуры
- проекта.</para>
-
- <!-- @ENGLISH {{{
- <para>However you make use of mixed-revisions in your working
- copy, there are limitations to this flexibility.</para>
- @ENGLISH }}} -->
- <para>Какими бы небыли причины использования смешанных правок в рабочей
- копии, у этой возможности существуют ограничения.</para>
-
- <!-- @ENGLISH {{{
- <para>First, you cannot commit the deletion of a file or
- directory which isn't fully up-to-date. If a newer version of
- the item exists in the repository, your attempt to delete will
- be rejected, to prevent you from accidentally
- destroying changes you've not yet seen.</para>
- @ENGLISH }}} -->
- <para>Во-первых, вы не можете отправить в хранилище изменения файла
- или директории, которые не соответствуют текущему состоянию
- хранилища и приведут к потере информации. Если хранилище содержит
- более новую версию, то ваша попытка замены будет отклонена, что бы не
- допустить случайной потери изменений, которых вы еще не видели.</para>
-
- <!-- @ENGLISH {{{
- <para>Second, you cannot commit a metadata change to a directory
- unless it's fully up-to-date. You'll learn about attaching
- <quote>properties</quote> to items in Chapter 6. A
- directory's working revision defines a specific set of entries
- and properties, and thus committing a property change to an
- out-of-date directory may destroy properties you've not yet
- seen.</para>
- @ENGLISH }}} -->
- <para>Во-вторых, вы не можете отправить в хранилище измененные
- метаданные директории, если она не находится полностью в актуальном
- состоянии. С присоединением <quote>свойств</quote> к элементам вы
- познакомитесь в Главе 6. Рабочая правка директории определяет набор
- свойств и входящих в нее элементов и отправка подобных изменений от
- директории не соответствующей текущему состоянию хранилища может
- уничтожить свойства, с которыми вы не успели познакомиться.</para>
</sect2>
Modified: trunk/src/ru/book/ch03.xml
==============================================================================
--- trunk/src/ru/book/ch03.xml (original)
+++ trunk/src/ru/book/ch03.xml Sat Jul 30 23:44:58 2005
@@ -6,7 +6,7 @@
@ENGLISH }}} -->
<title>Экскурсия по Subversion</title>
<chapterinfo>
- <edition>1530</edition>
+ <edition>1575</edition>
</chapterinfo>
<!-- See also svn.preface.organization -->
Modified: trunk/src/ru/book/ch04.xml
==============================================================================
--- trunk/src/ru/book/ch04.xml (original)
+++ trunk/src/ru/book/ch04.xml Sat Jul 30 23:44:58 2005
@@ -5,7 +5,7 @@
@ENGLISH }}} -->
<title>Ветвление и слияние</title>
<chapterinfo>
- <edition>1530</edition>
+ <edition>1575</edition>
</chapterinfo>
<!-- See also svn.preface.organization -->
Modified: trunk/src/ru/book/ch05.xml
==============================================================================
--- trunk/src/ru/book/ch05.xml (original)
+++ trunk/src/ru/book/ch05.xml Sat Jul 30 23:44:58 2005
@@ -5,7 +5,7 @@
@ENGLISH }}} -->
<title>Администрирование хранилища</title>
<chapterinfo>
- <edition>1563</edition>
+ <edition>1575</edition>
</chapterinfo>
<!-- See also svn.preface.organization -->
Modified: trunk/src/ru/book/ch06.xml
==============================================================================
--- trunk/src/ru/book/ch06.xml (original)
+++ trunk/src/ru/book/ch06.xml Sat Jul 30 23:44:58 2005
@@ -6,7 +6,7 @@
@ENGLISH }}} -->
<title>Настройка сервера</title>
<chapterinfo>
- <edition>1563</edition>
+ <edition>1575</edition>
</chapterinfo>
<!-- See also svn.preface.organization -->
Modified: trunk/src/ru/book/ch07.xml
==============================================================================
--- trunk/src/ru/book/ch07.xml (original)
+++ trunk/src/ru/book/ch07.xml Sat Jul 30 23:44:58 2005
@@ -6,7 +6,7 @@
@ENGLISH }}} -->
<title>Профессиональное использование Subversion</title>
<chapterinfo>
- <edition>1563</edition>
+ <edition>1575</edition>
</chapterinfo>
<!-- See also svn.preface.organization -->
@@ -2060,12 +2060,15 @@
objects in the working copy, it can also be used to examine
objects in the repository. If the main argument to
<command>svn info</command> is a working copy path, then all
- of the working copy's cached information is displayed; any
+ of the working copy's cached information is displayed; any
mention of a lock means that the working copy is holding a
- lock token. If the main argument to <command>svn
- info</command> is a URL, then the information reflects the
- latest version of an object in the repository; any mention of
- a lock describes the current lock on the object.</para>
+ lock token (if a file is locked by another user or in another
+ working copy, <command>svn info</command> on a working copy
+ path will show no lock information at all). If the main
+ argument to <command>svn info</command> is a URL, then the
+ information reflects the latest version of an object in the
+ repository; any mention of a lock describes the current lock
+ on the object.</para>
<para>So in this particular example, Sally can see that Harry
locked the file on Feburary 16th to <quote>make a quick
Modified: trunk/src/ru/book/ch08.xml
==============================================================================
--- trunk/src/ru/book/ch08.xml (original)
+++ trunk/src/ru/book/ch08.xml Sat Jul 30 23:44:58 2005
@@ -6,7 +6,7 @@
@ENGLISH }}} -->
<title>Информация для разработчиков</title>
<chapterinfo>
- <edition>1563</edition>
+ <edition>1575</edition>
</chapterinfo>
<!-- See also svn.preface.organization -->
Modified: trunk/src/ru/book/foreword.xml
==============================================================================
--- trunk/src/ru/book/foreword.xml (original)
+++ trunk/src/ru/book/foreword.xml Sat Jul 30 23:44:58 2005
@@ -9,7 +9,7 @@
<title>Foreword</title>
@ENGLISH }}} -->
<prefaceinfo>
- <edition>1563</edition>
+ <edition>1575</edition>
</prefaceinfo>
<title>Предисловие</title>
Modified: trunk/src/ru/sync.py
==============================================================================
--- trunk/src/ru/sync.py (original)
+++ trunk/src/ru/sync.py Sat Jul 30 23:44:58 2005
@@ -40,8 +40,24 @@
def get_list():
fnames = glob.glob('*.xml')
fnames.sort()
+ frlist = ()
+ rmin = 0xffffffff
+ rbase = get_base() + 1
for file in fnames:
- print file, '\t', get_last(file)
+ rev = get_last(file)
+ if rev:
+ if rev < rmin:
+ rmin = rev
+ frlist += (file, rev),
+ rdelta1 = rmin + ((rbase - rmin) / 3)
+ rdelta2 = rbase - ((rbase - rmin) / 3)
+ for f, r in frlist:
+ if r in range(rdelta2, rbase):
+ print '\x1b[32m', f, '\t', r, '\x1b[0m'
+ elif r in range(rdelta1, rdelta2):
+ print '\x1b[33m', f, '\t', r, '\x1b[0m'
+ elif r in range(rmin, rdelta1):
+ print '\x1b[31m', f, '\t', r, '\x1b[0m'
def main():
if len(sys.argv) < 2:
More information about the svnbook-dev
mailing list