--- a/.hgignore	Sat Jul 28 22:58:18 2012 +0200
+++ b/.hgignore	Sun Jul 29 12:29:35 2012 -0500
@@ -15,6 +15,7 @@
 *$py.class
 *.swp
 *.prof
+*.zip
 \#*\#
 .\#*
 tests/.coverage*

--- a/contrib/win32/mercurial.ini	Sat Jul 28 22:58:18 2012 +0200
+++ b/contrib/win32/mercurial.ini	Sun Jul 29 12:29:35 2012 -0500
@@ -36,7 +36,6 @@
 ;
 [extensions]
 ;acl =
-;alias =
 ;bugzilla =
 ;children =
 ;churn =
@@ -50,7 +49,9 @@
 ;hgcia =
 ;hgk =
 ;highlight = 
+;histedit =
 ;interhg =
+;largefiles =
 ;keyword =
 ;mq =
 ;notify =
@@ -60,6 +61,9 @@
 ;purge =
 ;rebase =
 ;record =
+;relink =
+;schemes =
+;share =
 ;transplant =
 ;win32mbcs =
 ;zeroconf =

--- a/hgext/histedit.py	Sat Jul 28 22:58:18 2012 +0200
+++ b/hgext/histedit.py	Sun Jul 29 12:29:35 2012 -0500
@@ -37,7 +37,6 @@
  #  d, drop = remove commit from history
  #  m, mess = edit message without changing commit content
  #
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 In this file, lines beginning with ``#`` are ignored. You must specify a rule
 for each revision in your history. For example, if you had meant to add gamma
@@ -57,7 +56,6 @@
  #  d, drop = remove commit from history
  #  m, mess = edit message without changing commit content
  #
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 At which point you close the editor and ``histedit`` starts working. When you
 specify a ``fold`` operation, ``histedit`` will open an editor when it folds

--- a/hgext/largefiles/overrides.py	Sat Jul 28 22:58:18 2012 +0200
+++ b/hgext/largefiles/overrides.py	Sun Jul 29 12:29:35 2012 -0500
@@ -934,10 +934,8 @@
     if revs:
         revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)]
 
-    remoteui = hg.remoteui
-
     try:
-        remote = hg.repository(remoteui(repo, opts), dest)
+        remote = hg.peer(repo, opts, dest)
     except error.RepoError:
         return None
     o = lfutil.findoutgoing(repo, remote, False)

--- a/mercurial/peer.py	Sat Jul 28 22:58:18 2012 +0200
+++ b/mercurial/peer.py	Sun Jul 29 12:29:35 2012 -0500
@@ -39,9 +39,6 @@
     def peer(self):
         return self
 
-    def peer(self):
-        return self
-
     def canpush(self):
         return True
 

--- a/mercurial/revset.py	Sat Jul 28 22:58:18 2012 +0200
+++ b/mercurial/revset.py	Sun Jul 29 12:29:35 2012 -0500
@@ -1424,7 +1424,7 @@
 
 def unstable(repo, subset, x):
     """``unstable()``
-    Unstable changesets are non-obsolete with obsolete descendants."""
+    Unstable changesets are non-obsolete with obsolete ancestors."""
     # i18n: "unstable" is a keyword
     getargs(x, 0, 0, _("unstable takes no arguments"))
     unstableset = set(repo.revs('(obsolete()::) - obsolete()'))

--- a/mercurial/templates/raw/map	Sat Jul 28 22:58:18 2012 +0200
+++ b/mercurial/templates/raw/map	Sun Jul 29 12:29:35 2012 -0500
@@ -1,3 +1,5 @@
+default = 'shortlog'
+shortlog = "'raw' is not a browsable style"
 mimetype = 'text/plain; charset={encoding}'
 header = ''
 footer = ''