From 952c612703117eb0b308b656c29a1e7e633bd07f Mon Sep 17 00:00:00 2001 From: bringert Date: Sun, 3 Sep 2006 20:14:10 +0000 Subject: [PATCH] Added darcs add to darcs instructions. --- doc/darcs.html | 44 ++++++++++++++++++++++++++------------------ doc/darcs.txt | 39 +++++++++++++++++++++++---------------- 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 @@

GF Darcs repository

Author: Björn Bringert <bringert@cs.chalmers.se>
-Last update: Mon Aug 28 14:11:23 2006 +Last update: Sun Sep 3 22:14:06 2006

@@ -122,7 +122,18 @@ 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
@@ -130,7 +141,15 @@ of your changes. To record some changes, use:
 

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

@@ -232,23 +251,12 @@ 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: -

-
-  $ 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. +have to record the changes that you want to commit, then you push them +to the main 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 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: