Changes between Version 7 and Version 8 of UsingPidginMonotone

Timestamp:

Dec 12, 2006, 3:32:09 PM (17 years ago)

Author:

datallah

Comment:

a couple tyop fixes

UsingPidginMonotone

@@ -24 +24 @@
 (The variables here are just to help you understand which parts of the process are up to your personal choice.)
 
-This will create a database for storing your Gaim development stuffs, fetch the entire revision history available from pidgin.im to that database, and then check out a working copy of the newest revision of Gaim in that database.  To update the database from the server in the future, you can either a) simply go to {{{$WORKINGDIR}}} and execute {{{mtn pull}}}, or execute {{{mtn -d $DATABASE pull}}} from anywhere.  Note that this will pull the new revision ''history'' from the server, but will not update your working directory to reflect the newest avaialble revision.  For this, you need to run {{{mtn up}}} in {{{$WORKINGDIR}}}.
+This will create a database for storing your Gaim development stuffs, fetch the entire revision history available from pidgin.im to that database, and then check out a working copy of the newest revision of Gaim in that database.  To update the database from the server in the future, you can either a) simply go to {{{$WORKINGDIR}}} and execute {{{mtn pull}}}, or execute {{{mtn -d $DATABASE pull}}} from anywhere.  Note that this will pull the new revision ''history'' from the server, but will not update your working directory to reflect the newest available revision.  For this, you need to run {{{mtn up}}} in {{{$WORKINGDIR}}}.
 
 Consult the monotone documents, and particularly [http://venge.net/monotone/docs/CVS-Phrasebook.html#CVS-Phrasebook their CVS phrasebook] to see the things you can now do with your database and working copy.  You should find that most of the actions at this point feel pretty familiar.
@@ -70 +70 @@
 }}}
 
-Given that such structure exists and is possible, it can be eploited intentionally as well as created inadvertently.  Monotone:DaggyFixes discusses just this, and its usage in identifying and fixing bugs.  Additionally, this means that it is not necessary (as it often is with svn and CVS) to update your working directory before committing pending changes; simply commit them at the point where you created them, and then merge this commit with the branch as it currently stands.
+Given that such structure exists and is possible, it can be exploited intentionally as well as created inadvertently.  Monotone:DaggyFixes discusses just this, and its usage in identifying and fixing bugs.  Additionally, this means that it is not necessary (as it often is with svn and CVS) to update your working directory before committing pending changes; simply commit them at the point where you created them, and then merge this commit with the branch as it currently stands.
 
 Note that {{{mtn update}}} will not update a branch which has multiple heads; you will either have to explicitly {{{mtn update -r <revision>}}} to select a particular head (or other revision), or merge the divergent heads before updating.