Sun Jan 8 11:32:45 PST 2006 Bill Trost <[EMAIL PROTECTED]>
* Minor documentation editing.
Change details:
* Replace "repo" with "repository" where practical.
* Replace "an email" with something less grating. (-:
* Try to consistify formatting, punctuation, & capitalization.
* etc.
New patches:
[Minor documentation editing.
Bill Trost <[EMAIL PROTECTED]>**20060108193245
Change details:
* Replace "repo" with "repository" where practical.
* Replace "an email" with something less grating. (-:
* Try to consistify formatting, punctuation, & capitalization.
* etc.
] {
hunk ./AmendRecord.lhs 58
- "Replace a patch with a better version before it leaves your repo."
+ "Replace a patch with a better version before it leaves your repository."
hunk ./AmendRecord.lhs 81
- "from the same repo may cause repository corruption.\n"
+ "from the same repository may cause repository corruption.\n"
hunk ./AmendRecord.lhs 148
-amended repo to make sure it is valid. Darcs first creates a pristine
+amended repository to make sure it is valid. Darcs first creates a pristine
hunk ./Annotate.lhs 155
- [] -> fail "Annotate doesn't yet work right on empty repos."
+ [] -> fail "Annotate doesn't yet work right on empty repositories."
hunk ./Apply.lhs 185
- fail ("Error applying patch to recorded!\nRunning 'darcs repair' on the target repo may help.\n" ++ show e)
+ fail ("Error applying patch to recorded!\nRunning 'darcs repair' on the target repository may help.\n" ++ show e)
hunk ./Apply.lhs 235
-the patch was GPG-signed by a key which is in \verb!PUBRING!, and will
+the patch was GPG-signed by a key which is in \verb!PUBRING! and will
hunk ./Apply.lhs 274
-the patch is in the form of an email with its headers intact, so that darcs
+the patch is in the form of email with its headers intact, so that darcs
hunk ./Apply.lhs 299
-successfully applied. NOTE: For some reason mutt seems to set the umask
-such that patches created with the above macro are not world-readable. I'm
-not sure why this is, but use it with care.
+successfully applied. NOTE: In an attempt to make sure no one else
+can read your email, mutt seems to set the umask
+such that patches created with the above macro are not world-readable,so
+use it with care.
hunk ./Apply.lhs 315
-If you use `\verb!darcs apply --verify PUBRING --reply!' to create a
-pushable repo by applying patches automatically as they are received by
+If you use \verb!darcs apply --verify PUBRING --reply! to create a
+pushable repository by applying patches automatically as they are received by
hunk ./Apply.lhs 331
-recorded versions in sync on the repo. This means the conflict will exist
+recorded versions in sync on the repository. This means the conflict will exist
hunk ./Apply.lhs 385
-and you can add \verb!%<! to the end of the commandline if the command
-expects the complete mail on standard input. E.g. the commandline for
+and you can add \verb!%<! to the end of the command line if the command
+expects the complete mail on standard input. For example, the command line for
hunk ./ArgumentDefaults.lhs 61
-(but still want to do so when running check on that repo), and like to name
+(but still want to do so when running
+\verb'check' on that repository), and like to name
hunk ./Changes.lhs 55
-changes_description = "Gives a changelog-style summary of the repo history."
+changes_description = "Gives a changelog-style summary of the repository history."
hunk ./Changes.lhs 61
- "Changes gives a changelog-style summary of the repo history,\n"++
+ "Changes gives a changelog-style summary of the repository history,\n"++
hunk ./Check.lhs 64
-repo originally using \verb!darcs get --partial!), by default darcs check
+repository originally using \verb!darcs get --partial!), by default
+\verb'darcs check'
hunk ./Check.lhs 122
- putInfo $ text "The repo is consistent!"
+ putInfo $ text "The repository is consistent!"
hunk ./Check.lhs 136
- $$ text "Inconsistent repo!"
+ $$ text "Inconsistent repository!"
hunk ./DarcsArguments.lhs 254
-commands without actually being in the repo directory when calling the
-command. This is useful when running darcs as a pipe, as might be the case
-when running apply from a mailer.
+commands without actually being in the repository directory when calling the
+command. This is useful when running darcs in a pipe, as might be the case
+when running \verb'apply' from a mailer.
hunk ./DarcsArguments.lhs 408
-every file in the repo and comparing it with a reference version. However,
+every file in the repository and comparing it with a reference version. However,
hunk ./DarcsArguments.lhs 659
- "verify using openSSL with authorized keys from file 'KEYS'",
+ "verify using openSSL with authorized keys from file KEYS",
hunk ./DarcsArguments.lhs 704
- ExternalMerge "COMMAND" "Use external tool to merge conflicts",
+ ExternalMerge "COMMAND" "use external tool to merge conflicts",
hunk ./DarcsRepo.lhs 36
-patches that are in the repo. Moreover, it also gives the order of the
+patches that are in the repository. Moreover, it also gives the order of the
hunk ./DarcsRepo.lhs 39
-contained in a given repo, that repo can be reproduced based on only the
+contained in a given repository, that repository can be reproduced based on only the
hunk ./DarcsRepo.lhs 122
---to the repo root directory and returns enough information to translate
+--to the repository root directory and returns enough information to translate
hunk ./Depends.lhs 77
-thinking about not going past the end of a partial repo, or favour
-local repo stuff over remote repo stuff.
+thinking about not going past the end of a partial repository, or favour
+local repository stuff over remote repository stuff.
hunk ./Get.lhs 61
-If the remote repo and the current directory are in the same filesystem and
+If the remote repository and the current directory are in the same filesystem and
hunk ./Motd.lhs 29
-which will be displayed to users who get or pull from the repo without the
+which will be displayed to users who get or pull from the repository without the
hunk ./Optimize.lhs 108
-repo.
+repository.
hunk ./PatchMatch.lhs 103
-currently date matching always matches only the day itself. FIXME: It
+Currently date matching always matches only the day itself. FIXME: It
hunk ./Pull.lhs 76
- "Pull is used to bring changes made in another repo into the current repo\n"++
- "(that is, either the one in the current directory, or the one specified with\n"++
- "the --repodir option). Pull allows you to bring over all or some of the\n"++
- "patches that are in that repo but not in this one. Pull accepts an argument,\n"++
- "which is the URL from which to pull, and when called without an argument,\n"++
- "pull will use the repository from which you have most recently either pushed\n"++
- "or pulled.\n"
+ "Pull is used to bring changes made in another repository into the current\n"++
+ "repository (that is, either the one in the current directory, or the one\n"++
+ "specified with the --repodir option). Pull allows you to bring over all or\n"++
+ "some of the patches that are in that repository but not in this one. Pull\n"++
+ "accepts an argument, which is the URL from which to pull, and when called\n"++
+ "without an argument, pull will use the repository from which you have most\n"++
+ "recently either pushed or pulled.\n"
hunk ./Pull.lhs 120
- fail "Can't pull from current repo!"
+ fail "Can't pull from current repository!"
hunk ./Pull.lhs 174
- fail ("Error applying patch to recorded.\nRunning 'darcs repair' on the target repo may help.\n" ++ show e)
+ fail ("Error applying patch to recorded.\nRunning 'darcs repair' on the target repository may help.\n" ++ show e)
hunk ./Pull.lhs 231
-exists) on a scratch copy of the repo contents prior to actually performing
+exists) on a scratch copy of the repository contents prior to actually performing
hunk ./Pull.lhs 240
-repo lacks. Thus, the following syntax can be used to show you all the patch
-differences between two repos:
+repository lacks. Thus, the following syntax can be used to show you all the patch
+differences between two repositories:
hunk ./Push.lhs 93
- fail "Can't push to current repo!"
+ fail "Can't push to current repository!"
hunk ./Push.lhs 206
-file name. You may want to pull all the patches from the remote repo just
+file name. You may want to pull all the patches from the remote repository just
hunk ./Push.lhs 210
-If you want, you could set the target repo to use \verb!--allow-conflicts!.
+If you want, you could set the target repository to use \verb!--allow-conflicts!.
hunk ./Put.lhs 77
- fail "Can't put to current repo!"
+ fail "Can't put to current repository!"
hunk ./Put.lhs 90
- then fail "Target repo has already been initialized. Use 'push' instead."
+ then fail "Target repository has already been initialized. Use 'push' instead."
hunk ./Record.lhs 391
-applied before your patch can be applied to a repo. This can be used, for
+applied before your patch can be applied to a repository. This can be used, for
hunk ./Record.lhs 425
-recorded repo to make sure it is valid. Darcs first creates a pristine
+recorded repository to make sure it is valid. Darcs first creates a pristine
hunk ./Remove.lhs 54
- "Be aware that the file WILL be deleted from any other copy of the repo\n" ++
- "to which you later apply the patch.\n"
+ "Be aware that the file WILL be deleted from any other copy of the\n" ++
+ "repository to which you later apply the patch.\n"
hunk ./Repair.lhs 101
- then do putStrLn "The repo is already consistent, no changes made."
+ then do putStrLn "The repository is already consistent, no changes made."
hunk ./Replace.lhs 144
- then do putStrLn $ "Skipping file '"++f++"' which isn't in the repo."
+ then do putStrLn $ "Skipping file '"++f++"' which isn't in the repository."
hunk ./RepoFormat.lhs 63
- "Can't understand repo format:" : map unpackPS x
+ "Can't understand repository format:" : map unpackPS x
hunk ./RepoPrefs.lhs 91
-``boringfile'' to the name of your desired boring file (e.g.\ ``darcs
-setpref boringfile .boring'', where .boring is the repository path of a file
+``boringfile'' to the name of your desired boring file
+(e.g.\ \verb-darcs setpref boringfile .boring-, where \verb-.boring-
+is the repository path of a file
hunk ./RepoPrefs.lhs 95
-darcs added to your repository). The boringfile pref overrides
+darcs added to your repository). The boringfile preference overrides
hunk ./RepoPrefs.lhs 105
-simple ``darcs add newdir newdir/{}*'' without accidentally adding a bunch of
+simple \verb-darcs add newdir newdir/*-
+without accidentally adding a bunch of
hunk ./RepoPrefs.lhs 192
-``binariesfile'' to the name of your desired binaries file (e.g.\ ``darcs
-setpref binariesfile ./.binaries'', where .binaries is a file that has been
+``binariesfile'' to the name of your desired binaries file
+(e.g.\ \verb'darcs setpref binariesfile ./.binaries', where
+\verb'.binaries' is a file that has been
hunk ./RepoPrefs.lhs 322
-repo that others will use when they \verb!darcs send! a patch back to you.
+repository that others will use when they \verb!darcs send! a patch back to you.
hunk ./Send.lhs 275
-will cause darcs to open up an editor with which you can compose an email
+will cause darcs to open up an editor with which you can compose a message
hunk ./Send.lhs 282
-If you want to use a command different from the default one for sending mails,
-you need to specify a commandline with the \verb!--sendmail-command! option. The
-commandline can contain some format specifiers which are replaced by the actual
+If you want to use a command different from the default one for sending email,
+you need to specify a command line with the \verb!--sendmail-command! option. The
+command line can contain some format specifiers which are replaced by the actual
hunk ./Send.lhs 287
-for the patch bundle and the same specifiers in uppercase for the urlencoded values.
-Additionally you can add \verb!%<! to the end of the commandline if the command
-expects the complete mail on standard input. E.g.\ the commandlines for evolution
+for the patch bundle and the same specifiers in uppercase for the URL-encoded values.
+Additionally you can add \verb!%<! to the end of the command line if the command
+expects the complete email message on standard input. E.g.\ the command lines for evolution
hunk ./Tag.lhs 98
-A tagged version automatically depends on all patches in the repo. This
+A tagged version automatically depends on all patches in the repository. This
hunk ./Tag.lhs 100
-depending on all patches in the repo, except for those which are depended
-upon by other tags already in the repo. In the common case of a sequential
+depending on all patches in the repository, except for those which are depended
+upon by other tags already in the repository. In the common case of a sequential
hunk ./Tag.lhs 133
-Using \verb!tag! creates an entry in the repo history just like \verb!record!.
+Using \verb!tag! creates an entry in the repository history just like \verb!record!.
hunk ./Tag.lhs 147
-The above example would display all the tag names in use in the repo.
+The above example would display all the tag names in use in the repository.
hunk ./TrackDown.lhs 107
-a temporary directory with the latest repo content in it and cd to it.
+a temporary directory with the latest repository content in it and cd to it.
hunk ./TrackDown.lhs 154
- "make darcs &> /dev/null && cd ~/darcs && time darcs check && false"
+ "make darcs > /dev/null && cd ~/darcs && time darcs check && false"
hunk ./Unrecord.lhs 87
-that another user may be pulling from the same repo. Attempting to do so
+that another user may be pulling from the same repository. Attempting to do so
hunk ./Unrecord.lhs 199
- "Opposite of pull; unsafe if the patch is not in remote repo."
+ "Opposite of pull; unsafe if patch is not in remote repository."
hunk ./Unrecord.lhs 208
- "Beware that if the patches are not still present in another repo you will lose\n"++
- "precious code by unpulling!\n"
+ "Beware that if the patches are not still present in another repository you\n"++
+ "will lose precious code by unpulling!\n"
hunk ./Unrecord.lhs 219
-from the repo, but also removes the changes from the working directory. It
+from the repository, but also removes the changes from the working directory. It
hunk ./Unrecord.lhs 228
-to use unpull. If the patch was originally from another repo, then
+to use unpull. If the patch was originally from another repository, then
hunk ./best_practices.tex 31
- called {\em patches\/} (some other version control use the
+ called {\em patches\/} (some other version control systems use the
hunk ./best_practices.tex 186
-as long as all depended upon patches are there.
+as long as all patches depended upon are there.
hunk ./best_practices.tex 314
-but the same line added by a common depended upon patch.
+but the same line added by a common depended--upon patch.
hunk ./best_practices.tex 409
-``\verb!Davids Darcs Repo <[EMAIL PROTECTED]>!''. My .procmailrc
+``\verb!Davids Darcs Repo <[EMAIL PROTECTED]>!''. My
+\verb-.procmailrc-
hunk ./best_practices.tex 418
-This causes darcs apply to be run on any emails sent to ``Davids Darcs
-Repo''. Apply actually applies them only if they are signed by an
+This causes darcs apply to be run on any email sent to ``Davids Darcs
+Repo''.
+\verb'apply' actually applies them only if they are signed by an
hunk ./best_practices.tex 458
-repository using darcs push. As in Section~\ref{darcs-development-practices},
+repository using
+\verb'darcs push'. As in Section~\ref{darcs-development-practices},
hunk ./best_practices.tex 474
-few patches, and only once it is stable pushes to the central repo.
+few patches, and only once it is stable does he
+\verb'push' to the central repository.
hunk ./darcs-createrepo.lhs 35
-\verb!darcs-createrepo! creates a repo with no users having write
+\verb!darcs-createrepo! creates a repository with no users having write
hunk ./darcs-createrepo.lhs 46
- email <- askUser "What is to be the repo email address? "
+ email <- askUser "What is to be the repository email address? "
hunk ./darcs-createrepo.lhs 55
- putStrLn $ "Old repo is "++oldrepo
+ putStrLn $ "Old repository is "++oldrepo
hunk ./darcs-createrepo.lhs 66
- "Error copying over from the old repo."
+ "Error copying over from the old repository."
hunk ./darcs-createrepo.lhs 72
- "Error fixing ownership on repo patches."
+ "Error fixing ownership on repository patches."
hunk ./darcs.lhs 271
-{\tt /var/www/repos}, and then put a symlink to your repo there:
+{\tt /var/www/repos}, and then put a symlink to your repository there:
hunk ./darcs.lhs 277
-As long as you're running a web server and making your repo available to
+As long as you're running a web server and making your repository available to
hunk ./darcs.lhs 285
-browse your repos by pointing their web browsers at
+browse your repositories by pointing their web browsers at
hunk ./darcs.lhs 308
-which gets the whole repo.
+which gets the whole repository.
hunk ./darcs.lhs 316
-\section{Moving patches from one repo to another}
+\section{Moving patches from one repository to another}
hunk ./darcs.lhs 318
-Darcs is flexible as to how you move patches from one repo to another.
+Darcs is flexible as to how you move patches from one repository to another.
hunk ./darcs.lhs 326
-run \verb|darcs pull| in the repo you want to move the patch to. This is nice,
+run \verb|darcs pull| in the repository you want to move the patch to. This is nice,
hunk ./darcs.lhs 334
-reasons, or because it is often turned off. In this case you can use darcs
-send from that computer to generate a patch bundle destined for another
+reasons, or because it is often turned off. In this case you can use
+\verb|darcs send|
+from that computer to generate a patch bundle destined for another
hunk ./darcs.lhs 339
-(or the owner of that repo) run darcs apply to apply the patches contained
+(or the owner of that repository) run \verb|darcs apply| to apply the patches contained
hunk ./darcs.lhs 387
-in your sudoers file to allow the users to apply their patches to a
+in your \verb|sudoers| file to allow the users to apply their patches to a
hunk ./darcs.lhs 399
-each person with write access to a repo an account on your server. Darcs
+each person with write access to a repository an account on your server. Darcs
hunk ./darcs.lhs 415
-most complicated way to get patches from one repo to another\ldots\ so it'll
+most complicated way to get patches from one repository to another\ldots\ so it'll
hunk ./darcs.lhs 449
-of an existing copy of the repository. If your desired email is
+of an existing copy of the repository. If your desired email address is
hunk ./darcs.lhs 457
-emails it receives. However, the patcher will bounce any emails which
-aren't signed by a key in the
+email it receives. However, the patcher will bounce any email which
+isn't signed by a key in the
hunk ./darcs.lhs 535
-people authorized to send to your repo. Here I'll give a second way of
+people authorized to send to your repository. Here I'll give a second way of
hunk ./darcs.lhs 569
-to the remote repo by pointing \verb!darcs changes! at a remote repo:
+to the remote repository by pointing \verb!darcs changes! at a remote repository:
hunk ./darcs.lhs 574
-That shows you the last 10 changes in the remote repo. You can adjust the options given
+That shows you the last 10 changes in the remote repository. You can adjust the options given
hunk ./darcs.lhs 743
-\section{Modifying the contents of a repo}
+\section{Modifying the contents of a repository}
hunk ./tests/pending_has_conflicts.pl 40
-like( darcs('repair'), qr/The repo is already consistent, no changes made/i, 'darcs repair finds no problem');
+like( darcs('repair'), qr/The repository is already consistent, no changes made/i, 'darcs repair finds no problem');
hunk ./tests/pull.pl 74
- like(`$DARCS pull -a $abs_path 2>&1`, qr/Can.t pull from current repo!/i, $test_name);
+ like(`$DARCS pull -a $abs_path 2>&1`, qr/Can.t pull from current repository!/i, $test_name);
hunk ./tests/push.pl 58
- like( darcs(qw/push -a/,getcwd()), qr/Can't push to current repo!/i, $test_name);
+ like( darcs(qw/push -a/,getcwd()), qr/Can't push to current repository!/i, $test_name);
hunk ./tests/put.pl 52
- like($out , qr/Can't put.*current repo!/i, $test_name);
+ like($out , qr/Can't put.*current repository!/i, $test_name);
}
Context:
[properly quote paths so that paths with spaces in them are okay
[EMAIL PROTECTED]
[fix up debug printouts in cygwin-wrapper.bash
[EMAIL PROTECTED]
[smoother invocation of cygwin-wrapper.bash -- it detects fully-qualified path to itself by leading /
[EMAIL PROTECTED]
[print out the patch name when a test fails.
Zachary P. Landau <[EMAIL PROTECTED]>**20051205055109]
[Use POSIX-style option for 'head', instead of obsolescent syntax
Marnix Klooster <[EMAIL PROTECTED]>**20051216111731]
[Update "darcs init" documentation to match its behavior.
Bill Trost <[EMAIL PROTECTED]>**20060105040737]
[Fix mistyped /dev/null, fixes --sendmail-command in Windows
Esa Ilari Vuokko <[EMAIL PROTECTED]>**20051129160120]
[Use \ as path separator for GnuPG in Windows -- makes apply --verify work
Esa Ilari Vuokko <[EMAIL PROTECTED]>**20051129164533]
[make dangers and recommended use of "Amend" clearer in the docs.
Mark Stosberg <[EMAIL PROTECTED]>**20051213140523
I think it's important to be clearer about when it's appropriate to use 'amend',
so I moved some notes into the short and mid-length help texts.
]
[update web page to reflect 1.0.5 as latest stable source.
Tommy Pettersson <[EMAIL PROTECTED]>**20051213111137]
[fix handling of absolute paths containing drive letters
Will <[EMAIL PROTECTED]>**20051208054737
This fixes issue 47 where paths containing drive letters (i.e. on windows)
are not treated as absolute paths.
]
[bump version to 1.0.6pre1
Tommy Pettersson <[EMAIL PROTECTED]>**20051208092839]
[TAG 1.0.5
Tommy Pettersson <[EMAIL PROTECTED]>**20051207112730]
Patch bundle hash:
2192f22853cfa3b62f83fadaaa17a9818508241d
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
