[svnbook commit] r1548 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Wed Jul 13 13:32:21 CDT 2005
Author: sunny256
Date: Wed Jul 13 13:32:20 2005
New Revision: 1548
Modified:
trunk/src/nb/TRANSLATION-STATUS
trunk/src/nb/book/ch01.xml
trunk/src/nb/book/ch02.xml
trunk/src/nb/book/ch03.xml
Log:
Started translation of all the <screen> examples in the Norwegian
svnbook.
* src/nb/TRANSLATION-STATUS
Added a new “Translation of examples” section.
* src/nb/book/ch01.xml
* src/nb/book/ch02.xml
* src/nb/book/ch03.xml
Finished.
Modified: trunk/src/nb/TRANSLATION-STATUS
==============================================================================
--- trunk/src/nb/TRANSLATION-STATUS (original)
+++ trunk/src/nb/TRANSLATION-STATUS Wed Jul 13 13:32:20 2005
@@ -82,5 +82,32 @@
book/ch04.xml
book/ch05.xml (line 2502, 46%) -- sunny256
+4. Translation of examples
+
+ 4.1. Nothing there
+
+ book/ch00.xml
+ book/foreword.xml
+
+ 4.2. Finished
+
+ book/ch01.xml
+ book/ch02.xml
+ book/ch03.xml
+
+ 4.3. Will do
+
+ book/appa.xml
+ book/appb.xml
+ book/appc.xml
+ book/book.xml
+ book/ch04.xml
+ book/ch05.xml
+ book/ch06.xml
+ book/ch07.xml
+ book/ch08.xml
+ book/ch09.xml
+ book/copyright.xml
+
$Id$
vim: set tw=72 nowrap et sw=2 ts=2 sts=2 fo+=2w fenc=utf8 :
Modified: trunk/src/nb/book/ch01.xml
==============================================================================
--- trunk/src/nb/book/ch01.xml (original)
+++ trunk/src/nb/book/ch01.xml Wed Jul 13 13:32:20 2005
@@ -989,14 +989,14 @@
@ENGLISH }}} -->
<screen>
$ svn import /tmp/mittprosjekt file:///sti/til/depot/mittprosjekt -m "Innledende import"
-Adding /tmp/mittprosjekt/branches
-Adding /tmp/mittprosjekt/tags
-Adding /tmp/mittprosjekt/trunk
-Adding /tmp/mittprosjekt/trunk/foo.c
-Adding /tmp/mittprosjekt/trunk/bar.c
-Adding /tmp/mittprosjekt/trunk/Makefile
+Legger til /tmp/mittprosjekt/branches
+Legger til /tmp/mittprosjekt/tags
+Legger til /tmp/mittprosjekt/trunk
+Legger til /tmp/mittprosjekt/trunk/foo.c
+Legger til /tmp/mittprosjekt/trunk/bar.c
+Legger til /tmp/mittprosjekt/trunk/Makefile
…
-Committed revision 1.
+La inn revisjon 1.
$
</screen>
@@ -1053,7 +1053,7 @@
A mittprosjekt/bar.c
A mittprosjekt/Makefile
…
-Checked out revision 1.
+Sjekket ut revisjon 1.
</screen>
<!-- @ENGLISH {{{
Modified: trunk/src/nb/book/ch02.xml
==============================================================================
--- trunk/src/nb/book/ch02.xml (original)
+++ trunk/src/nb/book/ch02.xml Wed Jul 13 13:32:20 2005
@@ -877,12 +877,20 @@
<para>For å publisere dine forandringer til andre, kan du bruke
Subversions <command>commit</command>-kommando:</para>
+<!-- @ENGLISH {{{
<screen>
$ svn commit button.c
Sending button.c
Transmitting file data .
Committed revision 57.
</screen>
+ at ENGLISH }}} -->
+<screen>
+$ svn commit button.c
+Sender button.c
+Sender fildata .
+La inn revisjon 57.
+</screen>
<!-- @ENGLISH {{{
<para>Now your changes to <filename>button.c</filename> have
Modified: trunk/src/nb/book/ch03.xml
==============================================================================
--- trunk/src/nb/book/ch03.xml (original)
+++ trunk/src/nb/book/ch03.xml Wed Jul 13 13:32:20 2005
@@ -177,9 +177,9 @@
<!-- ¤ Eksemplene må vente. -->
<screen>
$ svn commit --message "Corrected number of cheese slices."
-Sending sandwich.txt
-Transmitting file data .
-Committed revision 3.
+Sender sandwich.txt
+Sender fildata .
+La inn revisjon 3.
</screen>
<!-- @ENGLISH {{{
@@ -345,7 +345,7 @@
@ENGLISH }}} -->
<screen>
$ svn diff --revision PREV:COMMITTED foo.c
-# viser den siste forandringen lagt inn til foo.c
+# viser den siste forandringen lagt inn i foo.c
$ svn log --revision HEAD
# viser loggmelding for den seneste innleggingen i depotet
@@ -458,7 +458,7 @@
<screen>
$ svn log --revision {2002-11-28}
------------------------------------------------------------------------
-r12 | ira | 2002-11-27 12:31:51 -0600 (Wed, 27 Nov 2002) | 6 lines
+r12 | ira | 2002-11-27 12:31:51 -0600 (ons, 27 nov 2002) | 6 lines
…
</screen>
@@ -614,7 +614,7 @@
A trunk/configure.in
A trunk/IDEAS
…
-Checked out revision 2499.
+Sjekket ut revisjon 2499.
</screen>
<sidebar>
@@ -664,7 +664,7 @@
A tools/dtd
A tools/dtd/dblite.dtd
…
-Checked out revision 2499.
+Sjekket ut revisjon 2499.
</screen>
<!-- @ENGLISH {{{
@@ -778,7 +778,7 @@
A subv/configure.in
A subv/IDEAS
…
-Checked out revision 2499.
+Sjekket ut revisjon 2499.
</screen>
<!-- @ENGLISH {{{
@@ -919,12 +919,20 @@
Bruk <command>svn update</command> for å få arbeidskopien i synk
med den siste revisjonen i depotet.</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn update
U foo.c
U bar.c
Updated to revision 2.
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn update
+U foo.c
+U bar.c
+Oppdatert til revisjon 2.
+</screen>
<!-- @ENGLISH {{{
<para>In this case, someone else checked in modifications to
@@ -2003,8 +2011,9 @@
(<option>-u</option>)-valget, som kontakter depotet og legger
til informasjon om ting som er utdatert:</para>
+ <!-- @ENGLISH {{{
<screen>
-$ svn status --show-updates --verbose
+$ svn status -ﳢ-show-updates -ﳢ-verbose
M * 44 23 sally README
M 44 20 harry bar.c
* 44 35 harry stuff/trout.c
@@ -2012,6 +2021,16 @@
A 0 ? ? stuff/things/bloo.h
Status against revision: 46
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn status --show-updates --verbose
+M * 44 23 sally README
+M 44 20 harry bar.c
+ * 44 35 harry stuff/trout.c
+D 44 19 ira stuff/fish.c
+A 0 ? ? stuff/things/bloo.h
+Status mot revisjon: 46
+</screen>
<!-- @ENGLISH {{{
<para>Notice the two asterisks: if you were to run
@@ -2075,15 +2094,12 @@
/usr/bin/diff --extensions '-bc' foo.c</command>.</para>
</footnote></para>
- <!-- ¤ De eksemplene venter man med til det blir litt mer
- oversikt. Da tas alle i en stor omgang så ting ikke føkkes opp
- mer enn nødvendig. -->
-
+ <!-- @ENGLISH {{{
<screen>
$ svn diff
Index: bar.c
===================================================================
---- bar.c (revision 3)
+-ﳢ-ﳢ- bar.c (revision 3)
+++ bar.c (working copy)
@@ -1,7 +1,12 @@
+#include <sys/types.h>
@@ -2100,25 +2116,66 @@
Index: README
===================================================================
---- README (revision 3)
+-ﳢ-ﳢ- README (revision 3)
+++ README (working copy)
@@ -193,3 +193,4 @@
+Note to self: pick up laundry.
Index: stuff/fish.c
===================================================================
---- stuff/fish.c (revision 1)
+-ﳢ-ﳢ- stuff/fish.c (revision 1)
+++ stuff/fish.c (working copy)
-Welcome to the file known as 'fish'.
-Information on fish will be here soon.
Index: stuff/things/bloo.h
===================================================================
---- stuff/things/bloo.h (revision 8)
+-ﳢ-ﳢ- stuff/things/bloo.h (revision 8)
+++ stuff/things/bloo.h (working copy)
+Here is a new file to describe
+things about bloo.
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn diff
+Index: bar.c
+===================================================================
+--- bar.c (revisjon 3)
++++ bar.c (arbeidskopi)
+@@ -1,7 +1,12 @@
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++
++#include <stdio.h>
+
+ int main(void) {
+- printf("Sekstifire skiver med amerikansk ost...\n");
++ printf("Sekstifem skiver med amerikansk ost...\n");
+ return 0;
+ }
+
+Index: README
+===================================================================
+--- README (revisjon 3)
++++ README (arbeidskopi)
+@@ -193,3 +193,4 @@
++Husk: Plukk opp skittentøyet.
+
+Index: stuff/fish.c
+===================================================================
+--- stuff/fish.c (revisjon 1)
++++ stuff/fish.c (arbeidskopi)
+-Velkommen til fila som er kjent som «fish».
+-Det vil bli litt fiskeinfo her etterhvert.
+
+Index: stuff/things/bloo.h
+===================================================================
+--- stuff/things/bloo.h (revisjon 8)
++++ stuff/things/bloo.h (arbeidskopi)
++Her er en ny fil for å fortelle
++ting om bloo.
+</screen>
<!-- @ENGLISH {{{
<para>The <command>svn diff</command> command produces this
@@ -2199,10 +2256,16 @@
<para>Dette er en perfekt mulighet til å bruke kommandoen
<command>svn revert</command>.</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn revert README
Reverted 'README'
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn revert README
+Tilbakestilte «README»
+</screen>
<!-- @ENGLISH {{{
<para>Subversion reverts the file to its pre-modified state by
@@ -2222,6 +2285,7 @@
eksempel kan du bestemme deg for at du likevel ikke vil legge
til en ny fil:</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn status foo
? foo
@@ -2235,6 +2299,20 @@
$ svn status foo
? foo
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn status foo
+? foo
+
+$ svn add foo
+A foo
+
+$ svn revert foo
+Tilbakestilte «foo»
+
+$ svn status foo
+? foo
+</screen>
<note>
<!-- @ENGLISH {{{
@@ -2267,6 +2345,7 @@
<para>Eller kanskje du fjernet en fil fra versjonskontroll ved
en ulykke:</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn status README
README
@@ -2280,6 +2359,20 @@
$ svn status README
README
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn status README
+ README
+
+$ svn delete README
+D README
+
+$ svn revert README
+Tilbakestilte «README»
+
+$ svn status README
+ README
+</screen>
</sect3>
@@ -2364,6 +2457,7 @@
Tenk deg at du kjører <command>svn update</command> og noen
interessante ting skjer:</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn update
U INSTALL
@@ -2371,6 +2465,14 @@
C bar.c
Updated to revision 46.
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn update
+U INSTALL
+G README
+C bar.c
+Oppdatert til revisjon 46.
+</screen>
<!-- @ENGLISH {{{
<para>The <computeroutput>U</computeroutput> and
@@ -2565,6 +2667,7 @@
Sally oppdaterer sin arbeidskopi før hun legger den inn og får
en konflikt:</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn update
C sandwich.txt
@@ -2575,6 +2678,17 @@
sandwich.txt.r1
sandwich.txt.r2
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn update
+C sandwich.txt
+Oppdatert til revisjon 2.
+$ ls -1
+sandwich.txt
+sandwich.txt.mine
+sandwich.txt.r1
+sandwich.txt.r2
+</screen>
<!-- @ENGLISH {{{
<para>At this point, Subversion will <emphasis>not</emphasis>
@@ -2586,12 +2700,18 @@
<filename>sandwich.txt</filename> før de tre midlertidige filene
er fjernet.</para>
- <!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
-$ svn commit --message "Add a few more things"
+$ svn commit -ﳢ-message "Add a few more things"
svn: Commit failed (details follow):
svn: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains in conflict
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn commit --message "Legg til noen flere ting"
+svn: Innsending feilet (detaljer følger):
+svn: Avbryter innsending: «/home/sally/svn-work/sandwich.txt» er fortsatt i konflikt
+</screen>
<!-- @ENGLISH {{{
<para>If you get a conflict, you need to do one of three
@@ -2651,10 +2771,16 @@
Det var det vi trodde.</para>
</footnote></para>
+ <!-- @ENGLISH {{{
<screen>
$ svn resolved sandwich.txt
Resolved conflicted state of 'sandwich.txt'
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn resolved sandwich.txt
+Konflikten i «sandwich.txt» er løst
+</screen>
<sect3 id="svn.tour.cycle.resolve.byhand">
<!-- @ENGLISH {{{
@@ -2792,11 +2918,16 @@
<para>Nå kan du kjøre <command>svn resolved</command>, og du er
klar til å legge inn forandringene dine:</para>
- <!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
$ svn resolved sandwich.txt
$ svn commit -m "Go ahead and use my sandwich, discarding Sally's edits."
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn resolved sandwich.txt
+$ svn commit -m "Gå i gang med å bruke mitt smørbrød, bort med Sallys redigeringer."
+</screen>
<!-- @ENGLISH {{{
<para>Remember, if you ever get confused while editing the
@@ -2832,6 +2963,7 @@
midlertidige filene laget av Subversion over filen i
arbeidskopien din:</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn update
C sandwich.txt
@@ -2841,6 +2973,16 @@
$ cp sandwich.txt.r2 sandwich.txt
$ svn resolved sandwich.txt
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn update
+C sandwich.txt
+Oppdatert til revisjon 2.
+$ ls sandwich.*
+sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1
+$ cp sandwich.txt.r2 sandwich.txt
+$ svn resolved sandwich.txt
+</screen>
</sect3>
@@ -2860,12 +3002,20 @@
deg for å forkaste endringene dine og starte på nytt, bare
reverser forandringene dine:</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn revert sandwich.txt
Reverted 'sandwich.txt'
$ ls sandwich.*
sandwich.txt
</screen>
+ @ENGLISH }}} -->
+<screen>
+$ svn revert sandwich.txt
+Tilbakestilte «sandwich.txt»
+$ ls sandwich.*
+sandwich.txt
+</screen>
<!-- @ENGLISH {{{
<para>Note that when you revert a conflicted file, you don't
@@ -2936,12 +3086,20 @@
<option>-m</option>)-valget:</para>
<!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
-$ svn commit --message "Corrected number of cheese slices."
+$ svn commit -ﳢ-message "Corrected number of cheese slices."
Sending sandwich.txt
Transmitting file data .
Committed revision 3.
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn commit --message "Ordnet antall osteskiver."
+Sender sandwich.txt
+Sender fildata .
+La inn revisjon 3.
+</screen>
<!-- @ENGLISH {{{
<para>However, if you've been composing your log message as you
@@ -2953,12 +3111,20 @@
vil du kanskje be Subversion om å hente meldingen fra en fil ved
å angi filnavnet med <option>--file</option>-valget:</para>
+ <!-- @ENGLISH {{{
<screen>
-$ svn commit --file logmsg
+$ svn commit -ﳢ-file logmsg
Sending sandwich.txt
Transmitting file data .
Committed revision 4.
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn commit --file logmsg
+Sender sandwich.txt
+Sender fildata .
+La inn revisjon 4.
+</screen>
<!-- @ENGLISH {{{
<para>If you fail to specify either the
@@ -2990,6 +3156,7 @@
uten å lagre endringene.
Hvis du allerede har lagret innleggingsmeldingen, kan du
slette teksten og lagre på nytt.</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn commit
Waiting for Emacs...Done
@@ -2999,6 +3166,16 @@
a
$
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn commit
+Venter på Emacs...Ferdig
+
+Loggmeldingen er uforandret eller ikke spesifisert
+Avbryt (a), fortsett (c), rediger (e)
+a
+$
+</screen>
</tip>
<!-- @ENGLISH {{{
@@ -3017,13 +3194,20 @@
innleggingen feile med en melding om at en eller flere av filene
dine er utdaterte:</para>
-<!-- ¤ -->
+<!-- @ENGLISH {{{
<screen>
-$ svn commit --message "Add another rule"
+$ svn commit -ﳢ-message "Add another rule"
Sending rules.txt
svn: Commit failed (details follow):
svn: Out of date: 'rules.txt' in transaction 'g'
</screen>
+ at ENGLISH }}} -->
+<screen>
+$ svn commit --message "La til en ny regel"
+Sender rules.txt
+svn: Innsending feilet (detaljer følger):
+svn: Utdatert: «rules.txt» i transaksjon «g»
+</screen>
<!-- @ENGLISH {{{
<para>At this point, you need to run <command>svn
@@ -3170,21 +3354,38 @@
den ble skrevet, loggmeldingen som hører til
innleggingen.</para>
- <!-- ¤ Som sagt, eksempler ordnes seinere. -->
+ <!-- @ENGLISH {{{
<screen>
$ svn log
-------------------------------------------------------------------------
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
r3 | sally | Mon, 15 Jul 2002 18:03:46 -0500 | 1 line
Added include lines and corrected # of cheese slices.
-------------------------------------------------------------------------
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
r2 | harry | Mon, 15 Jul 2002 17:47:57 -0500 | 1 line
Added main() methods.
-------------------------------------------------------------------------
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
r1 | sally | Mon, 15 Jul 2002 17:40:08 -0500 | 1 line
Initial import
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
+</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn log
+------------------------------------------------------------------------
+r3 | sally | man, 15 jul 2002 18:03:46 -0500 | 1 line
+
+La til include-linjer og ordnet antall osteskiver.
+------------------------------------------------------------------------
+r2 | harry | man, 15 jul 2002 17:47:57 -0500 | 1 line
+
+La til main()-metoder.
+------------------------------------------------------------------------
+r1 | sally | man, 15 jul 2002 17:40:08 -0500 | 1 line
+
+Innledende import
------------------------------------------------------------------------
</screen>
@@ -3273,9 +3474,23 @@
vil <command>svn log</command> inkludere en liste over
forandrede stier for en revision i listeformatet:</para>
- <!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
$ svn log -r 8 -v
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
+r8 | sally | 2002-07-14 08:15:29 -0500 | 1 line
+Changed paths:
+M /trunk/code/foo.c
+M /trunk/code/bar.h
+A /trunk/code/doc/README
+
+Frozzled the sub-space winch.
+
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
+</screen>
+ @ENGLISH }}} -->
+ <!-- ¤ Ja, det var _det_, ja. --><screen>
+$ svn log -r 8 -v
------------------------------------------------------------------------
r8 | sally | 2002-07-14 08:15:29 -0500 | 1 line
Changed paths:
@@ -3408,11 +3623,12 @@
<filename>.svn</filename>-området:</para>
<!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
$ svn diff
Index: rules.txt
===================================================================
---- rules.txt (revision 3)
+-ﳢ-ﳢ- rules.txt (revision 3)
+++ rules.txt (working copy)
@@ -1,4 +1,5 @@
Be kind to others
@@ -3423,6 +3639,22 @@
+Listen when others are speaking
$
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn diff
+Index: rules.txt
+===================================================================
+--- rules.txt (revisjon 3)
++++ rules.txt (arbeidskopi)
+@@ -1,4 +1,5 @@
+ Vær snill med andre
+ Frihet = ansvar
+ Alt med måte
+-Tygg med munnen åpen
++Tygg med munnen lukket
++Hør etter når andre prater
+$
+</screen>
</sect3>
@@ -3443,12 +3675,12 @@
arbeidskopien bli sammenlignet med den spesifiserte revisjonen
i depotet.</para>
- <!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
-$ svn diff --revision 3 rules.txt
+$ svn diff -ﳢ-revision 3 rules.txt
Index: rules.txt
===================================================================
---- rules.txt (revision 3)
+-ﳢ-ﳢ- rules.txt (revision 3)
+++ rules.txt (working copy)
@@ -1,4 +1,5 @@
Be kind to others
@@ -3459,6 +3691,22 @@
+Listen when others are speaking
$
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn diff --revision 3 rules.txt
+Index: rules.txt
+===================================================================
+--- rules.txt (revisjon 3)
++++ rules.txt (arbeidskopi)
+@@ -1,4 +1,5 @@
+ Vær snill med andre
+ Frihet = ansvar
+ Alt med måte
+-Tygg med munnen åpen
++Tygg med munnen lukket
++Hør etter når andre prater
+$
+</screen>
</sect3>
@@ -3478,12 +3726,12 @@
<option>--revision</option> (<option>-r</option>), blir disse
to revisjonene sammenlignet direkte.</para>
- <!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
-$ svn diff --revision 2:3 rules.txt
+$ svn diff -ﳢ-revision 2:3 rules.txt
Index: rules.txt
===================================================================
---- rules.txt (revision 2)
+-ﳢ-ﳢ- rules.txt (revision 2)
+++ rules.txt (revision 3)
@@ -1,4 +1,4 @@
Be kind to others
@@ -3493,6 +3741,21 @@
Chew with your mouth open
$
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn diff --revision 2:3 rules.txt
+Index: rules.txt
+===================================================================
+--- rules.txt (revisjon 2)
++++ rules.txt (revisjon 3)
+@@ -1,4 +1,4 @@
+ Vær snill med andre
+-Frihet = sjokoladeis
++Frihet = ansvar
+ Alt med måte
+ Tygg med munnen åpen
+$
+</screen>
<!-- @ENGLISH {{{
<para>Not only can you use <command>svn diff</command> to
@@ -3541,15 +3804,24 @@
nødvendigvis forskjellene mellom to filer, kan du bruke
<command>svn cat</command>:</para>
- <!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
-$ svn cat --revision 2 rules.txt
+$ svn cat -ﳢ-revision 2 rules.txt
Be kind to others
Freedom = Chocolate Ice Cream
Everything in moderation
Chew with your mouth open
$
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn cat --revision 2 rules.txt
+Vær snill med andre
+Frihet = sjokoladeis
+Alt med måte
+Tygg med munnen åpen
+$
+</screen>
<!-- @ENGLISH {{{
<para>You can also redirect the output directly into a
@@ -3816,12 +4088,12 @@
$ svnadmin create /usr/local/svn/nyttdepot
$ svn import mitt_tre file:///usr/local/svn/nyttdepot/et/prosjekt \
-m "Innledende import"
-Adding mitt_tre/foo.c
-Adding mitt_tre/bar.c
-Adding mitt_tre/subdir
-Adding mitt_tre/subdir/quux.h
+Legger til mitt_tre/foo.c
+Legger til mitt_tre/bar.c
+Legger til mitt_tre/subdir
+Legger til mitt_tre/subdir/quux.h
-Committed revision 1.
+La inn revisjon 1.
</screen>
<!-- @ENGLISH {{{
More information about the svnbook-dev
mailing list