Changes between Version 9 and Version 10 of UsingPidginMercurial

Timestamp:

Jul 1, 2012, 6:18:01 AM (12 years ago)

Author:

MarkDoliner

Comment:

We're using Mercurial now, so make this present tense instead of future tense

UsingPidginMercurial

@@ -1 +1 @@
 = Using Pidgin Mercurial =
-This page is intended to house documentation for using Pidgin's Mercurial repositories once we switch from Monotone to Mercurial.
+The master copy of the source code for libpurple, Pidgin, Finch, http://pidgin.im/, and http://imfreedom.org/ resides in [http://mercurial.selenic.com/ Mercurial] repositories.
 
 == Background ==
@@ -6 +6 @@
 
 == Anonymous Pull (Non-Developers) ==
-All Pidgin Mercurial repositories will be available via HTTP from [http://hg.pidgin.im http://hg.pidgin.im].
+All Pidgin Mercurial repositories are available via HTTP from [http://hg.pidgin.im http://hg.pidgin.im].
 
 == Developers ==
 
 === Configure Mercurial ===
-Mercurial uses an rc file to control its configuration.  There are several that will affect your use.  One set of them is in `/etc/mercurial` and will be controlled by your package manager.  The others are entirely under your control.  Each repository has its own `hgrc` file in `repository/.hg/hgrc` which can be used to configure mercurial's behavior when interacting with that repository.  Finally, there is `~/.hgrc`, which will configure mercurial's behavior for any repository your user account touches.
+Mercurial uses an rc file to control its configuration.  There are several that affect your use.  One set of them is in `/etc/mercurial` and is controlled by your package manager.  The others are entirely under your control.  Each repository has its own `hgrc` file in `repository/.hg/hgrc` which can be used to configure Mercurial's behavior when interacting with that repository.  Finally, there is `~/.hgrc`, which affects Mercurial's behavior for any repository your user account touches.
 
-When working with Pidgin's mercurial repositories, we expect that you will have at least a minimum configuration that gives your name in the 'First Last <email@address.tld>' format.  To do that, two simple lines need to be inserted into an appropriate `hgrc` (I believe most people will want to do this in `~/.hgrc`):
+When working with Pidgin's Mercurial repositories, we expect you to have at least a minimum configuration that gives your name in the 'First Last <email@address.tld>' format.  To do that, two simple lines need to be inserted into an appropriate `hgrc` (I believe most people will want to do this in `~/.hgrc`):
 {{{
 [ui]
@@ -19 +19 @@
 }}}
 
-Other useful options that can be set in the `[ui]` section of an `hgrc` are the merge tool and to make mercurial verbose or not:
+Other useful options that can be set in the `[ui]` section of an `hgrc` are the merge tool and to make Mercurial verbose or not:
 {{{
 [ui]
@@ -63 +63 @@
 
 === Access Control ===
-Access control on Pidgin's Mercurial server is strict.  The repositories will be structured like so (developers/CPW's listed here are for the purpose of example):
+Access control on Pidgin's Mercurial server is strict.  The repositories are structured like so (developers/CPW's listed here are for the purpose of example):
 
 {{{
 hg.pidgin.im          # Mercurial server
  + pidgin               # "Official" Pidgin and libpurple repositories
- |  + main                # replaces im.pidgin.pidgin in Monotone
- |  + 2_x_y               # replaces im.pidgin.pidgin.2.x.y in Monotone
+ |  + main                # replaced im.pidgin.pidgin in Monotone
+ |  + 2_x_y               # replaced im.pidgin.pidgin.2.x.y in Monotone
  + dev                  # Developers' repositories
  |  + darkrain            # for all repositories darkrain wishes to create
- |  |  + irc                # replaces im.pidgin.cpw.darkrain42.irc in Monotone
- |  |  + xmpp_roster        # replaces im.pidgin.cpw.darkrain42.xppp.roster in Monotone
+ |  |  + irc                # replaced im.pidgin.cpw.darkrain42.irc in Monotone
+ |  |  + xmpp_roster        # replaced im.pidgin.cpw.darkrain42.xppp.roster in Monotone
  |  + rekkanoryo          # for all repositories rekkanoryo wishes to create
- |     + examples           # replaces im.pidgin.cpw.rekkanoryo.examples in Monotone
+ |     + examples           # replaced im.pidgin.cpw.rekkanoryo.examples in Monotone
  + cpw                  # Crazy Patch Writers' repositories
  |  + eionrobb            # for all repositories eionrobb wishes to create
@@ -92 +92 @@
 }}}
 
-Access control will be as follows:
+Access control is as follows:
   * Developers have write access to `pidgin/*`
   * Developers can create and modify repositories in `dev/$NICKNAME/`