summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbringert <bringert@cs.chalmers.se>2006-09-03 20:14:10 +0000
committerbringert <bringert@cs.chalmers.se>2006-09-03 20:14:10 +0000
commit1807dc437960afd13adc17cce52c54992daa9570 (patch)
tree0878257e7984fa5a2736d1a015a2c5896c5213b9
parent39a31d07d5c70f490c04da0969716b4bd12bb6ae (diff)
Added darcs add to darcs instructions.
-rw-r--r--doc/darcs.html44
-rw-r--r--doc/darcs.txt39
2 files changed, 49 insertions, 34 deletions
diff --git a/doc/darcs.html b/doc/darcs.html
index cfd1e821b..af83f62fc 100644
--- a/doc/darcs.html
+++ b/doc/darcs.html
@@ -8,7 +8,7 @@
<P ALIGN="center"><CENTER><H1>GF Darcs repository</H1>
<FONT SIZE="4">
<I>Author: Björn Bringert &lt;bringert@cs.chalmers.se&gt;</I><BR>
-Last update: Mon Aug 28 14:11:23 2006
+Last update: Sun Sep 3 22:14:06 2006
</FONT></CENTER>
<P></P>
@@ -122,7 +122,18 @@ Without <CODE>-a</CODE>, you can choose which patches you want to get.
<H2>Recording local changes</H2>
<P>
Since every copy is a repository, you can have local version control
-of your changes. To record some changes, use:
+of your changes.
+</P>
+<P>
+If you have added files, you first need to tell your local repository to
+keep them under revision control:
+</P>
+<PRE>
+ $ darcs add file1 file2 ...
+</PRE>
+<P></P>
+<P>
+To record changes, use:
</P>
<PRE>
$ darcs record
@@ -130,7 +141,15 @@ of your changes. To record some changes, use:
<P></P>
<P>
This creates a patch against the previous version and stores it in your
-local repository.
+local repository. You can record any number of changesets before
+pushing them to the main repo. In fact, you don't have to push them at
+all if you want to keep the changes only in your local repo.
+</P>
+<P>
+If you think there are too many questions about what to record, you
+can use the <CODE>-a</CODE> flag to <CODE>record</CODE>. Or answer <CODE>a</CODE> to the first
+question. Both of these record all the changes you have in your local
+repository.
</P>
<A NAME="toc7"></A>
<H2>Submitting patches</H2>
@@ -232,23 +251,12 @@ Without <CODE>-a</CODE>, you can choose which patches you want to get.
<H2>Commit your changes</H2>
<P>
There are two steps to commiting a change to the main repo. First you
-have to record the changes that you want to commit:
+have to record the changes that you want to commit, then you push them
+to the main repo.
</P>
-<PRE>
- $ darcs record
-</PRE>
-<P></P>
<P>
-This creates a patch against the previous version and stores it in your
-local repository. You can record any number of changesets before
-pushing them to the main repo. In fact, you don't have to push them at
-all if you want to keep the changes only in your local repo.
-</P>
-<P>
-If you think there are too many questions about what to record, you
-can use the <CODE>-a</CODE> flag to <CODE>record</CODE>. Or answer <CODE>a</CODE> to the first
-question. Both of these record all the changes you have in your local
-repository.
+For instructions on recording your changes locally,
+see "Recording local changes" above.
</P>
<P>
Then you can push the patch(es) to the main repo. If you are using
diff --git a/doc/darcs.txt b/doc/darcs.txt
index e883376de..eac168ab8 100644
--- a/doc/darcs.txt
+++ b/doc/darcs.txt
@@ -77,14 +77,31 @@ Without ``-a``, you can choose which patches you want to get.
== Recording local changes ==
Since every copy is a repository, you can have local version control
-of your changes. To record some changes, use:
+of your changes.
+
+If you have added files, you first need to tell your local repository to
+keep them under revision control:
+
+```
+$ darcs add file1 file2 ...
+```
+
+To record changes, use:
```
$ darcs record
```
This creates a patch against the previous version and stores it in your
-local repository.
+local repository. You can record any number of changesets before
+pushing them to the main repo. In fact, you don't have to push them at
+all if you want to keep the changes only in your local repo.
+
+If you think there are too many questions about what to record, you
+can use the ``-a`` flag to ``record``. Or answer ``a`` to the first
+question. Both of these record all the changes you have in your local
+repository.
+
== Submitting patches ==
@@ -180,21 +197,11 @@ Without ``-a``, you can choose which patches you want to get.
== Commit your changes ==
There are two steps to commiting a change to the main repo. First you
-have to record the changes that you want to commit:
+have to record the changes that you want to commit, then you push them
+to the main repo.
-```
-$ darcs record
-```
-
-This creates a patch against the previous version and stores it in your
-local repository. You can record any number of changesets before
-pushing them to the main repo. In fact, you don't have to push them at
-all if you want to keep the changes only in your local repo.
-
-If you think there are too many questions about what to record, you
-can use the ``-a`` flag to ``record``. Or answer ``a`` to the first
-question. Both of these record all the changes you have in your local
-repository.
+For instructions on recording your changes locally,
+see "Recording local changes" above.
Then you can push the patch(es) to the main repo. If you are using
ssh-access, all you need to do is: