Changes between Version 39 and Version 40 of UsingPidginMonotone

Timestamp:

Aug 28, 2009, 9:23:03 PM (14 years ago)

Author:

queueram

Comment:

Update some of the monotone URLs

UsingPidginMonotone

@@ -2 +2 @@
 = Using Monotone for Pidgin =
 
-[http://venge.net/monotone Monotone] is a distributed version control system, and as such has some user-visible differences compared to, say, CVS or SVN.  In addition, each of the existing DVCS solutions seem to have idiosyncrasies to themselves, and monotone is no exception.  Due to these things, we'll try to grow some monotone howtos and best practices on this page.
+[http://monotone.ca Monotone] is a distributed version control system, and as such has some user-visible differences compared to, say, CVS or SVN.  In addition, each of the existing DVCS solutions seem to have idiosyncrasies to themselves, and monotone is no exception.  Due to these things, we'll try to grow some monotone howtos and best practices on this page.
 
 == External Documentation ==
@@ -8 +8 @@
  * The [http://monotone.ca/docs/Tutorial.html Monotone tutorial] is an excellent place to start, with good examples on using Monotone for day-to-day tasks and some treatment of the workflow differences between a DVCS and a legacy VCS
  * The [http://monotone.ca/docs/index.html official manual]
- * The [http://venge.net/mtn-wiki/ monotone wiki] has a lot of good information, as well
+ * The [http://www.monotone.ca/wiki/ monotone wiki] has a lot of good information, as well
 
 == Best Practices ==
@@ -52 +52 @@
 This will create a database for storing your development stuff, fetch the entire revision history available from mtn.pidgin.im to that database, and then check out a working copy of the newest revision of Pidgin 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.
+Consult the monotone documents, and particularly [http://www.monotone.ca/docs/CVS-Phrasebook.html 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.
 
 
@@ -130 +130 @@
 === Branch Complexity ===
 
-While all of this seems somewhat complex and difficult compared to the linear-history model of CVS or svn, it is really quite unavoidable in the context of a distributed VCS (as the above example shows).  Different systems handle it differently (darcs in particular using quite a different model), but the problem will exist in any such system.  Once you get your head wrapped around it, it's actually quite intuitive and powerful.  For more information, see the [http://venge.net/monotone/docs/Branching-and-Merging.html Branching and Merging] chapter of the monotone documentation.
+While all of this seems somewhat complex and difficult compared to the linear-history model of CVS or svn, it is really quite unavoidable in the context of a distributed VCS (as the above example shows).  Different systems handle it differently (darcs in particular using quite a different model), but the problem will exist in any such system.  Once you get your head wrapped around it, it's actually quite intuitive and powerful.  For more information, see the [http://www.monotone.ca/docs/Branching-and-Merging.html Branching and Merging] chapter of the monotone documentation.
 
 == Merging and Conflicts ==