diff -Nru mercurial-2.6/.hgsigs mercurial-2.6.1/.hgsigs
--- mercurial-2.6/.hgsigs	2013-05-01 22:49:53.000000000 +0000
+++ mercurial-2.6.1/.hgsigs	2013-05-14 23:43:53.000000000 +0000
@@ -70,3 +70,4 @@
 50c922c1b5145dab8baefefb0437d363b6a6c21c 0 iD8DBQBRWnUnywK+sNU5EO8RAuQRAJwM42cJqJPeqJ0jVNdMqKMDqr4dSACeP0cRVGz1gitMuV0x8f3mrZrqc7I=
 8a7bd2dccd44ed571afe7424cd7f95594f27c092 0 iD8DBQBRXfBvywK+sNU5EO8RAn+LAKCsMmflbuXjYRxlzFwId5ptm8TZcwCdGkyLbZcASBOkzQUm/WW1qfknJHU=
 292cd385856d98bacb2c3086f8897bc660c2beea 0 iD8DBQBRcM0BywK+sNU5EO8RAjp4AKCJBykQbvXhKuvLSMxKx3a2TBiXcACfbr/kLg5GlZTF/XDPmY+PyHgI/GM=
+23f785b38af38d2fca6b8f3db56b8007a84cd73a 0 iD8DBQBRgZwNywK+sNU5EO8RAmO4AJ4u2ILGuimRP6MJgE2t65LZ5dAdkACgiENEstIdrlFC80p+sWKD81kKIYI=
diff -Nru mercurial-2.6/.hgtags mercurial-2.6.1/.hgtags
--- mercurial-2.6/.hgtags	2013-05-01 22:49:53.000000000 +0000
+++ mercurial-2.6.1/.hgtags	2013-05-14 23:43:53.000000000 +0000
@@ -83,3 +83,4 @@
 50c922c1b5145dab8baefefb0437d363b6a6c21c 2.5.3
 8a7bd2dccd44ed571afe7424cd7f95594f27c092 2.5.4
 292cd385856d98bacb2c3086f8897bc660c2beea 2.6-rc
+23f785b38af38d2fca6b8f3db56b8007a84cd73a 2.6
diff -Nru mercurial-2.6/PKG-INFO mercurial-2.6.1/PKG-INFO
--- mercurial-2.6/PKG-INFO	2013-05-01 22:49:59.000000000 +0000
+++ mercurial-2.6.1/PKG-INFO	2013-05-14 23:44:00.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: mercurial
-Version: 2.6
+Version: 2.6.1
 Summary: Fast scalable distributed SCM (revision control, version control) system
 Home-page: http://mercurial.selenic.com/
 Author: Matt Mackall and many others
diff -Nru mercurial-2.6/debian/changelog mercurial-2.6.1/debian/changelog
--- mercurial-2.6/debian/changelog	2013-05-07 21:30:07.000000000 +0000
+++ mercurial-2.6.1/debian/changelog	2013-05-24 07:52:34.000000000 +0000
@@ -1,8 +1,25 @@
-mercurial (2.6-0ppa1~quantal1) quantal; urgency=low
+mercurial (2.6.1-1ppa1~quantal1) quantal; urgency=low
 
   * Automated backport.
 
- -- Max Bowsher <_@maxb.eu>  Tue, 07 May 2013 22:30:07 +0100
+ -- Max Bowsher <_@maxb.eu>  Fri, 24 May 2013 08:52:34 +0100
+
+mercurial (2.6.1-1ppa1) raring; urgency=low
+
+  * New PPA build
+
+ -- Max Bowsher <_@maxb.eu>  Fri, 24 May 2013 08:49:24 +0100
+
+mercurial (2.6.1-1) unstable; urgency=low
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+  [ Javi Merino ]
+  * New upstream release
+  * Blacklist test-histedit-arguments.t and test-websub.t
+
+ -- Javi Merino <vicho@debian.org>  Wed, 15 May 2013 22:16:29 +0100
 
 mercurial (2.6-0ppa1) raring; urgency=low
 
diff -Nru mercurial-2.6/debian/control mercurial-2.6.1/debian/control
--- mercurial-2.6/debian/control	2013-05-07 21:27:09.000000000 +0000
+++ mercurial-2.6.1/debian/control	2013-05-24 07:51:13.000000000 +0000
@@ -15,8 +15,8 @@
  unzip
 Standards-Version: 3.9.4
 Homepage: http://mercurial.selenic.com/
-Vcs-Svn: svn://svn.debian.org/python-apps/packages/mercurial/trunk
-Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/mercurial/trunk/
 X-Python-Version: >= 2.4
 
 Package: mercurial-common
diff -Nru mercurial-2.6/debian/mercurial.test_blacklist mercurial-2.6.1/debian/mercurial.test_blacklist
--- mercurial-2.6/debian/mercurial.test_blacklist	2013-05-07 21:27:09.000000000 +0000
+++ mercurial-2.6.1/debian/mercurial.test_blacklist	2013-05-24 07:51:13.000000000 +0000
@@ -27,6 +27,7 @@
 test-serve.t
 test-share.t
 test-subrepo-relative-path.t
+test-websub.t
 
 # Failed to locate styles (?)
 test-bisect3.t
diff -Nru mercurial-2.6/debian/patches/deb_specific__disable_libdir_replacement.patch mercurial-2.6.1/debian/patches/deb_specific__disable_libdir_replacement.patch
--- mercurial-2.6/debian/patches/deb_specific__disable_libdir_replacement.patch	2013-05-07 21:27:09.000000000 +0000
+++ mercurial-2.6.1/debian/patches/deb_specific__disable_libdir_replacement.patch	2013-05-24 07:51:13.000000000 +0000
@@ -12,7 +12,7 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -411,7 +411,6 @@ cmdclass = {'build': hgbuild,
+@@ -413,7 +413,6 @@ cmdclass = {'build': hgbuild,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,
              'build_hgextindex': buildhgextindex,
diff -Nru mercurial-2.6/debian/patches/deb_specific__hgk.py.patch mercurial-2.6.1/debian/patches/deb_specific__hgk.py.patch
--- mercurial-2.6/debian/patches/deb_specific__hgk.py.patch	2013-05-07 21:27:09.000000000 +0000
+++ mercurial-2.6.1/debian/patches/deb_specific__hgk.py.patch	2013-05-24 07:51:13.000000000 +0000
@@ -2,7 +2,7 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -312,7 +312,7 @@ def view(ui, repo, *etc, **opts):
+@@ -313,7 +313,7 @@ def view(ui, repo, *etc, **opts):
      "start interactive history viewer"
      os.chdir(repo.root)
      optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
diff -Nru mercurial-2.6/debian/patches/deb_specific__install-help-separately mercurial-2.6.1/debian/patches/deb_specific__install-help-separately
--- mercurial-2.6/debian/patches/deb_specific__install-help-separately	2013-05-07 21:27:09.000000000 +0000
+++ mercurial-2.6.1/debian/patches/deb_specific__install-help-separately	2013-05-24 07:51:13.000000000 +0000
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -469,8 +469,7 @@ if sys.platform.startswith('linux') and
+@@ -472,8 +472,7 @@ if sys.platform.startswith('linux') and
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  
@@ -14,7 +14,7 @@
      return p and p[0] != '.' and p[-1] != '~'
 --- a/mercurial/help.py
 +++ b/mercurial/help.py
-@@ -129,9 +129,11 @@ def loaddoc(topic):
+@@ -130,9 +130,11 @@ def loaddoc(topic):
              module = __file__
          base = os.path.dirname(module)
  
diff -Nru mercurial-2.6/debian/patches/deb_specific__install-mo-fhs.patch mercurial-2.6.1/debian/patches/deb_specific__install-mo-fhs.patch
--- mercurial-2.6/debian/patches/deb_specific__install-mo-fhs.patch	2013-05-07 21:27:09.000000000 +0000
+++ mercurial-2.6.1/debian/patches/deb_specific__install-mo-fhs.patch	2013-05-24 07:51:13.000000000 +0000
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -469,7 +469,7 @@ if sys.platform.startswith('linux') and
+@@ -472,7 +472,7 @@ if sys.platform.startswith('linux') and
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  
diff -Nru mercurial-2.6/debian/patches/deb_specific__install-templates-separately mercurial-2.6.1/debian/patches/deb_specific__install-templates-separately
--- mercurial-2.6/debian/patches/deb_specific__install-templates-separately	2013-05-07 21:27:09.000000000 +0000
+++ mercurial-2.6.1/debian/patches/deb_specific__install-templates-separately	2013-05-24 07:51:13.000000000 +0000
@@ -2,7 +2,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -294,7 +294,7 @@ funcs = {
+@@ -323,7 +323,7 @@ funcs = {
  
  # template engine
  
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -475,14 +475,6 @@ packagedata = {'mercurial': ['locale/*/L
+@@ -478,14 +478,6 @@ packagedata = {'mercurial': ['locale/*/L
  def ordinarypath(p):
      return p and p[0] != '.' and p[-1] != '~'
  
diff -Nru mercurial-2.6/debian/patches/deb_specific__optional-dependencies mercurial-2.6.1/debian/patches/deb_specific__optional-dependencies
--- mercurial-2.6/debian/patches/deb_specific__optional-dependencies	2013-05-07 21:27:09.000000000 +0000
+++ mercurial-2.6.1/debian/patches/deb_specific__optional-dependencies	2013-05-24 07:51:13.000000000 +0000
@@ -74,7 +74,7 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -64,7 +64,7 @@ class convert_git(converter_source):
+@@ -79,7 +79,7 @@ class convert_git(converter_source):
          if not os.path.exists(path + "/objects"):
              raise NoRepo(_("%s does not look like a Git repository") % path)
  
diff -Nru mercurial-2.6/debian/patches/deb_specific__use_sensible-editor.patch mercurial-2.6.1/debian/patches/deb_specific__use_sensible-editor.patch
--- mercurial-2.6/debian/patches/deb_specific__use_sensible-editor.patch	2013-05-07 21:27:09.000000000 +0000
+++ mercurial-2.6.1/debian/patches/deb_specific__use_sensible-editor.patch	2013-05-24 07:51:13.000000000 +0000
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2061,8 +2061,8 @@ def debuginstall(ui):
+@@ -2039,8 +2039,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -701,7 +701,7 @@ class ui(object):
+@@ -753,7 +753,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -148,7 +148,7 @@
  msgid " (specify a commit editor in your .hgrc file)\n"
 --- a/i18n/it.po
 +++ b/i18n/it.po
-@@ -7157,8 +7157,8 @@ msgstr ""
+@@ -7156,8 +7156,8 @@ msgstr ""
  msgid "Checking commit editor...\n"
  msgstr "Sto controllando l'editor per il commit...\n"
  
@@ -159,7 +159,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -10462,7 +10462,7 @@ msgid ""
+@@ -10461,7 +10461,7 @@ msgid ""
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11335,8 +11335,8 @@ msgstr " (テンプレートのインス
+@@ -11520,8 +11520,8 @@ msgstr " (テンプレートのインス
  msgid "checking commit editor...\n"
  msgstr "メッセージ入力用エディタの確認中...\n"
  
@@ -181,7 +181,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
-@@ -17739,11 +17739,12 @@ msgstr ""
+@@ -18032,11 +18032,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18797,7 +18798,7 @@ msgid ""
+@@ -19179,7 +19180,7 @@ msgid ""
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -205,7 +205,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミットログ入力時のように、 エディタでファイルを開き、\n"
-@@ -18805,7 +18806,7 @@ msgstr ""
+@@ -19187,7 +19188,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -11497,10 +11497,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -11685,10 +11685,10 @@ msgstr " (modelos parecem ter sido insta
  msgid "checking commit editor...\n"
  msgstr "verificando editor para consolidação...\n"
  
@@ -229,7 +229,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -18086,10 +18086,12 @@ msgstr ""
+@@ -18377,10 +18377,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19173,7 +19175,7 @@ msgid ""
+@@ -19570,7 +19572,7 @@ msgid ""
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -253,7 +253,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -19181,7 +19183,7 @@ msgstr ""
+@@ -19578,7 +19580,7 @@ msgstr ""
  "    mensagens de consolidação. O editor usado é determinado pela\n"
  "    consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n"
  "    nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n"
@@ -349,7 +349,7 @@
      This is used by Python to find imported modules and may need to be
 --- a/mercurial/help/config.txt
 +++ b/mercurial/help/config.txt
-@@ -1137,7 +1137,8 @@ User interface controls.
+@@ -1151,7 +1151,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``
diff -Nru mercurial-2.6/doc/hg.1 mercurial-2.6.1/doc/hg.1
--- mercurial-2.6/doc/hg.1	2013-05-01 22:49:55.000000000 +0000
+++ mercurial-2.6.1/doc/hg.1	2013-05-14 23:43:55.000000000 +0000
@@ -7011,25 +7011,25 @@
 Logs event information to .hg/blackbox.log to help debug and diagnose problems.
 The events that get logged can be configured via the blackbox.track config key.
 Examples:
-.INDENT 0.0
-.INDENT 3.5
 .sp
+.nf
+.ft C
 [blackbox]
 track = *
-.sp
+
 [blackbox]
 track = command, commandfinish, commandexception, exthook, pythonhook
-.sp
+
 [blackbox]
 track = incoming
-.sp
+
 [blackbox]
 # limit the size of a log file
 maxsize = 1.5 MB
 # rotate up to N log files when the current one gets too big
 maxfiles = 3
-.UNINDENT
-.UNINDENT
+.ft P
+.fi
 .SS Commands
 .SS blackbox
 .sp
diff -Nru mercurial-2.6/doc/hg.1.html mercurial-2.6.1/doc/hg.1.html
--- mercurial-2.6/doc/hg.1.html	2013-05-01 22:49:56.000000000 +0000
+++ mercurial-2.6.1/doc/hg.1.html	2013-05-14 23:43:57.000000000 +0000
@@ -5296,19 +5296,22 @@
 <p>Logs event information to .hg/blackbox.log to help debug and diagnose problems.
 The events that get logged can be configured via the blackbox.track config key.
 Examples:</p>
-<blockquote>
-<p>[blackbox]
-track = *</p>
-<p>[blackbox]
-track = command, commandfinish, commandexception, exthook, pythonhook</p>
-<p>[blackbox]
-track = incoming</p>
-<p>[blackbox]
+<pre class="literal-block">
+[blackbox]
+track = *
+
+[blackbox]
+track = command, commandfinish, commandexception, exthook, pythonhook
+
+[blackbox]
+track = incoming
+
+[blackbox]
 # limit the size of a log file
 maxsize = 1.5 MB
 # rotate up to N log files when the current one gets too big
-maxfiles = 3</p>
-</blockquote>
+maxfiles = 3
+</pre>
 <div class="section" id="id7">
 <h3>Commands</h3>
 <div class="section" id="id8">
diff -Nru mercurial-2.6/doc/hgrc.5 mercurial-2.6.1/doc/hgrc.5
--- mercurial-2.6/doc/hgrc.5	2013-05-01 22:49:55.000000000 +0000
+++ mercurial-2.6.1/doc/hgrc.5	2013-05-14 23:43:55.000000000 +0000
@@ -155,6 +155,11 @@
 order until one or more configuration files are detected.
 .UNINDENT
 .UNINDENT
+.IP Note
+.
+The registry key \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eWow6432Node\eMercurial\fP
+is used when running 32\-bit Python on 64\-bit Windows.
+.RE
 .SH SYNTAX
 .sp
 A configuration file consists of sections, led by a \fB[section]\fP header
diff -Nru mercurial-2.6/doc/hgrc.5.html mercurial-2.6.1/doc/hgrc.5.html
--- mercurial-2.6/doc/hgrc.5.html	2013-05-01 22:49:57.000000000 +0000
+++ mercurial-2.6.1/doc/hgrc.5.html	2013-05-14 23:43:57.000000000 +0000
@@ -159,6 +159,11 @@
 a <tt class="docutils literal">Mercurial.ini</tt> file or be a directory where <tt class="docutils literal">*.rc</tt> files will
 be read.  Mercurial checks each of these locations in the specified
 order until one or more configuration files are detected.</blockquote>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">The registry key <tt class="docutils literal">HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial</tt>
+is used when running 32-bit Python on 64-bit Windows.</p>
+</div>
 </div>
 <div class="section" id="syntax">
 <h1><a class="toc-backref" href="#contents">Syntax</a></h1>
diff -Nru mercurial-2.6/hgext/blackbox.py mercurial-2.6.1/hgext/blackbox.py
--- mercurial-2.6/hgext/blackbox.py	2013-05-01 22:49:46.000000000 +0000
+++ mercurial-2.6.1/hgext/blackbox.py	2013-05-14 23:43:40.000000000 +0000
@@ -10,7 +10,7 @@
 
 Logs event information to .hg/blackbox.log to help debug and diagnose problems.
 The events that get logged can be configured via the blackbox.track config key.
-Examples:
+Examples::
 
   [blackbox]
   track = *
diff -Nru mercurial-2.6/hgext/convert/cvsps.py mercurial-2.6.1/hgext/convert/cvsps.py
--- mercurial-2.6/hgext/convert/cvsps.py	2013-05-01 22:49:46.000000000 +0000
+++ mercurial-2.6.1/hgext/convert/cvsps.py	2013-05-14 23:43:40.000000000 +0000
@@ -50,7 +50,7 @@
     >>> getrepopath('/foo/bar')
     '/foo/bar'
     >>> getrepopath('c:/foo/bar')
-    'c:/foo/bar'
+    '/foo/bar'
     >>> getrepopath(':pserver:10/foo/bar')
     '/foo/bar'
     >>> getrepopath(':pserver:10c:/foo/bar')
@@ -58,30 +58,30 @@
     >>> getrepopath(':pserver:/foo/bar')
     '/foo/bar'
     >>> getrepopath(':pserver:c:/foo/bar')
-    'c:/foo/bar'
+    '/foo/bar'
     >>> getrepopath(':pserver:truc@foo.bar:/foo/bar')
     '/foo/bar'
     >>> getrepopath(':pserver:truc@foo.bar:c:/foo/bar')
-    'c:/foo/bar'
+    '/foo/bar'
+    >>> getrepopath('user@server/path/to/repository')
+    '/path/to/repository'
     """
     # According to CVS manual, CVS paths are expressed like:
     # [:method:][[user][:password]@]hostname[:[port]]/path/to/repository
     #
-    # Unfortunately, Windows absolute paths start with a drive letter
-    # like 'c:' making it harder to parse. Here we assume that drive
-    # letters are only one character long and any CVS component before
-    # the repository path is at least 2 characters long, and use this
-    # to disambiguate.
+    # CVSpath is splitted into parts and then position of the first occurrence
+    # of the '/' char after the '@' is located. The solution is the rest of the
+    # string after that '/' sign including it
+
     parts = cvspath.split(':')
-    if len(parts) == 1:
-        return parts[0]
-    # Here there is an ambiguous case if we have a port number
-    # immediately followed by a Windows driver letter. We assume this
-    # never happens and decide it must be CVS path component,
-    # therefore ignoring it.
-    if len(parts[-2]) > 1:
-        return parts[-1].lstrip('0123456789')
-    return parts[-2] + ':' + parts[-1]
+    atposition = parts[-1].find('@')
+    start = 0
+
+    if atposition != -1:
+        start = atposition
+
+    repopath = parts[-1][parts[-1].find('/', start):]
+    return repopath
 
 def createlog(ui, directory=None, root="", rlog=True, cache=None):
     '''Collect the CVS rlog'''
diff -Nru mercurial-2.6/hgext/highlight/highlight.py mercurial-2.6.1/hgext/highlight/highlight.py
--- mercurial-2.6/hgext/highlight/highlight.py	2013-05-01 22:49:46.000000000 +0000
+++ mercurial-2.6.1/hgext/highlight/highlight.py	2013-05-14 23:43:41.000000000 +0000
@@ -38,12 +38,13 @@
 
     # To get multi-line strings right, we can't format line-by-line
     try:
-        lexer = guess_lexer_for_filename(fctx.path(), text[:1024])
+        lexer = guess_lexer_for_filename(fctx.path(), text[:1024],
+                                         stripnl=False)
     except (ClassNotFound, ValueError):
         try:
-            lexer = guess_lexer(text[:1024])
+            lexer = guess_lexer(text[:1024], stripnl=False)
         except (ClassNotFound, ValueError):
-            lexer = TextLexer()
+            lexer = TextLexer(stripnl=False)
 
     formatter = HtmlFormatter(style=style)
 
diff -Nru mercurial-2.6/hgext/largefiles/lfcommands.py mercurial-2.6.1/hgext/largefiles/lfcommands.py
--- mercurial-2.6/hgext/largefiles/lfcommands.py	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/hgext/largefiles/lfcommands.py	2013-05-14 23:43:41.000000000 +0000
@@ -502,7 +502,8 @@
         # lfile is added to the repository again. This happens when a
         # largefile is converted back to a normal file: the standin
         # disappears, but a new (normal) file appears as the lfile.
-        if os.path.exists(abslfile) and lfile not in repo[None]:
+        if (os.path.exists(abslfile) and
+            repo.dirstate.normalize(lfile) not in repo[None]):
             util.unlinkpath(abslfile)
             ret = -1
     state = repo.dirstate[lfutil.standin(lfile)]
diff -Nru mercurial-2.6/hgext/largefiles/overrides.py mercurial-2.6.1/hgext/largefiles/overrides.py
--- mercurial-2.6/hgext/largefiles/overrides.py	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/hgext/largefiles/overrides.py	2013-05-14 23:43:41.000000000 +0000
@@ -333,7 +333,7 @@
 # largefiles. This makes the merge proceed and we can then handle this
 # case further in the overridden manifestmerge function below.
 def overridecheckunknownfile(origfn, repo, wctx, mctx, f):
-    if lfutil.standin(f) in wctx:
+    if lfutil.standin(repo.dirstate.normalize(f)) in wctx:
         return False
     return origfn(repo, wctx, mctx, f)
 
diff -Nru mercurial-2.6/i18n/el.po mercurial-2.6.1/i18n/el.po
--- mercurial-2.6/i18n/el.po	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/i18n/el.po	2013-05-14 23:43:41.000000000 +0000
@@ -14181,7 +14181,7 @@
 msgstr ""
 
 msgid "&Delete"
-msgstr "&Διαγραφή"
+msgstr ""
 
 #, python-format
 msgid ""
@@ -14190,7 +14190,7 @@
 msgstr ""
 
 msgid "&Deleted"
-msgstr "&Διαγράφηκε"
+msgstr ""
 
 #, python-format
 msgid "update failed to remove %s: %s!\n"
@@ -14422,7 +14422,7 @@
 msgstr ""
 
 msgid "&Remote"
-msgstr "&Απομακρυσμένο:"
+msgstr ""
 
 #, python-format
 msgid ""
diff -Nru mercurial-2.6/i18n/pt_BR.po mercurial-2.6.1/i18n/pt_BR.po
--- mercurial-2.6/i18n/pt_BR.po	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/i18n/pt_BR.po	2013-05-14 23:43:41.000000000 +0000
@@ -504,12 +504,12 @@
 msgid ""
 "Logs event information to .hg/blackbox.log to help debug and diagnose problems.\n"
 "The events that get logged can be configured via the blackbox.track config key.\n"
-"Examples:"
+"Examples::"
 msgstr ""
 "Registra informação de eventos no arquivo .hg/blackbox.log para auxiliar\n"
 "depuração e diagnóstico de problemas. Os eventos que serão registrados\n"
 "podem ser configurados através da opção de configuração blackbox.track.\n"
-"Exemplos:"
+"Exemplos::"
 
 msgid ""
 "  [blackbox]\n"
diff -Nru mercurial-2.6/i18n/ru.po mercurial-2.6.1/i18n/ru.po
--- mercurial-2.6/i18n/ru.po	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/i18n/ru.po	2013-05-14 23:43:41.000000000 +0000
@@ -8053,11 +8053,11 @@
 
 # PROMPT
 msgid "&No"
-msgstr "&Нет"
+msgstr ""
 
 # PROMPT
 msgid "&Yes"
-msgstr "&Да"
+msgstr ""
 
 msgid "patchbomb canceled"
 msgstr "отправка отменена"
diff -Nru mercurial-2.6/mercurial/__version__.py mercurial-2.6.1/mercurial/__version__.py
--- mercurial-2.6/mercurial/__version__.py	2013-05-01 22:49:57.000000000 +0000
+++ mercurial-2.6.1/mercurial/__version__.py	2013-05-14 23:43:58.000000000 +0000
@@ -1,2 +1,2 @@
 # this file is autogenerated by setup.py
-version = "2.6"
+version = "2.6.1"
diff -Nru mercurial-2.6/mercurial/cmdutil.py mercurial-2.6.1/mercurial/cmdutil.py
--- mercurial-2.6/mercurial/cmdutil.py	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/mercurial/cmdutil.py	2013-05-14 23:43:41.000000000 +0000
@@ -2055,6 +2055,12 @@
                 checkout(f)
                 normal(f)
 
+            copied = copies.pathcopies(repo[parent], ctx)
+
+            for f in add[0] + undelete[0] + revert[0]:
+                if f in copied:
+                    repo.dirstate.copy(copied[f], f)
+
             if targetsubs:
                 # Revert the subrepos on the revert list
                 for sub in targetsubs:
diff -Nru mercurial-2.6/mercurial/commands.py mercurial-2.6.1/mercurial/commands.py
--- mercurial-2.6/mercurial/commands.py	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/mercurial/commands.py	2013-05-14 23:43:41.000000000 +0000
@@ -943,6 +943,9 @@
 
     Returns 0 on success.
     """
+    if label:
+        label = label.strip()
+
     if not opts.get('clean') and not label:
         ui.write("%s\n" % repo.dirstate.branch())
         return
diff -Nru mercurial-2.6/mercurial/dirstate.py mercurial-2.6.1/mercurial/dirstate.py
--- mercurial-2.6/mercurial/dirstate.py	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/mercurial/dirstate.py	2013-05-14 23:43:41.000000000 +0000
@@ -700,7 +700,7 @@
                 for nf in iter(visit):
                     # Report ignored items in the dmap as long as they are not
                     # under a symlink directory.
-                    if ignore(nf) and audit_path.check(nf):
+                    if audit_path.check(nf):
                         try:
                             results[nf] = lstat(join(nf))
                         except OSError:
diff -Nru mercurial-2.6/mercurial/help/config.txt mercurial-2.6.1/mercurial/help/config.txt
--- mercurial-2.6/mercurial/help/config.txt	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/mercurial/help/config.txt	2013-05-14 23:43:41.000000000 +0000
@@ -85,6 +85,9 @@
     be read.  Mercurial checks each of these locations in the specified
     order until one or more configuration files are detected.
 
+.. note:: The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
+   is used when running 32-bit Python on 64-bit Windows.
+
 Syntax
 ======
 
diff -Nru mercurial-2.6/mercurial/pathencode.c mercurial-2.6.1/mercurial/pathencode.c
--- mercurial-2.6/mercurial/pathencode.c	2013-05-01 22:49:46.000000000 +0000
+++ mercurial-2.6.1/mercurial/pathencode.c	2013-05-14 23:43:40.000000000 +0000
@@ -696,7 +696,7 @@
 	return 0;
 }
 
-#define MAXENCODE 4096 * 3
+#define MAXENCODE 4096 * 4
 
 static PyObject *hashencode(const char *src, Py_ssize_t len)
 {
diff -Nru mercurial-2.6/mercurial/posix.py mercurial-2.6.1/mercurial/posix.py
--- mercurial-2.6/mercurial/posix.py	2013-05-01 22:49:46.000000000 +0000
+++ mercurial-2.6.1/mercurial/posix.py	2013-05-14 23:43:40.000000000 +0000
@@ -194,6 +194,22 @@
     import fcntl # only needed on darwin, missing on jython
 
     def normcase(path):
+        '''
+        Normalize a filename for OS X-compatible comparison:
+        - escape-encode invalid characters
+        - decompose to NFD
+        - lowercase
+
+        >>> normcase('UPPER')
+        'upper'
+        >>> normcase('Caf\xc3\xa9')
+        'cafe\\xcc\\x81'
+        >>> normcase('\xc3\x89')
+        'e\\xcc\\x81'
+        >>> normcase('\xb8\xca\xc3\xca\xbe\xc8.JPG') # issue3918
+        '%b8%ca%c3\\xca\\xbe%c8.jpg'
+        '''
+
         try:
             path.decode('ascii') # throw exception for non-ASCII character
             return path.lower()
@@ -202,16 +218,42 @@
         try:
             u = path.decode('utf-8')
         except UnicodeDecodeError:
-            # percent-encode any characters that don't round-trip
-            p2 = path.decode('utf-8', 'ignore').encode('utf-8')
-            s = ""
-            pos = 0
+            # OS X percent-encodes any bytes that aren't valid utf-8
+            s = ''
+            g = ''
+            l = 0
             for c in path:
-                if p2[pos:pos + 1] == c:
+                o = ord(c)
+                if l and o < 128 or o >= 192:
+                    # we want a continuation byte, but didn't get one
+                    s += ''.join(["%%%02X" % ord(x) for x in g])
+                    g = ''
+                    l = 0
+                if l == 0 and o < 128:
+                    # ascii
                     s += c
-                    pos += 1
+                elif l == 0 and 194 <= o < 245:
+                    # valid leading bytes
+                    if o < 224:
+                        l = 1
+                    elif o < 240:
+                        l = 2
+                    else:
+                        l = 3
+                    g = c
+                elif l > 0 and 128 <= o < 192:
+                    # valid continuations
+                    g += c
+                    l -= 1
+                    if not l:
+                        s += g
+                        g = ''
                 else:
-                    s += "%%%02X" % ord(c)
+                    # invalid
+                    s += "%%%02X" % o
+
+            # any remaining partial characters
+            s += ''.join(["%%%02X" % ord(x) for x in g])
             u = s.decode('utf-8')
 
         # Decompose then lowercase (HFS+ technote specifies lower)
diff -Nru mercurial-2.6/mercurial/subrepo.py mercurial-2.6.1/mercurial/subrepo.py
--- mercurial-2.6/mercurial/subrepo.py	2013-05-01 22:49:46.000000000 +0000
+++ mercurial-2.6.1/mercurial/subrepo.py	2013-05-14 23:43:40.000000000 +0000
@@ -31,7 +31,7 @@
 def _calcfilehash(filename):
     data = ''
     if os.path.exists(filename):
-        fd = open(filename)
+        fd = open(filename, 'rb')
         data = fd.read()
         fd.close()
     return util.sha1(data).hexdigest()
diff -Nru mercurial-2.6/mercurial/win32.py mercurial-2.6.1/mercurial/win32.py
--- mercurial-2.6/mercurial/win32.py	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/mercurial/win32.py	2013-05-14 23:43:40.000000000 +0000
@@ -344,6 +344,12 @@
 def unlink(f):
     '''try to implement POSIX' unlink semantics on Windows'''
 
+    if os.path.isdir(f):
+        # use EPERM because it is POSIX prescribed value, even though
+        # unlink(2) on directories returns EISDIR on Linux
+        raise IOError(errno.EPERM,
+                      "Unlinking directory not permitted: '%s'" % f)
+
     # POSIX allows to unlink and rename open files. Windows has serious
     # problems with doing that:
     # - Calling os.unlink (or os.rename) on a file f fails if f or any
diff -Nru mercurial-2.6/tests/test-branches.t mercurial-2.6.1/tests/test-branches.t
--- mercurial-2.6/tests/test-branches.t	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-branches.t	2013-05-14 23:43:40.000000000 +0000
@@ -68,6 +68,18 @@
   abort: '\n' cannot be used in a name
   [255]
 
+trailing or leading spaces should be stripped before testing duplicates
+
+  $ hg branch 'b '
+  abort: a branch of the same name already exists
+  (use 'hg update' to switch to it)
+  [255]
+
+  $ hg branch ' b'
+  abort: a branch of the same name already exists
+  (use 'hg update' to switch to it)
+  [255]
+
 verify update will accept invalid legacy branch names
 
   $ hg init test-invalid-branch-name
diff -Nru mercurial-2.6/tests/test-casefolding.t mercurial-2.6.1/tests/test-casefolding.t
--- mercurial-2.6/tests/test-casefolding.t	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-casefolding.t	2013-05-14 23:43:40.000000000 +0000
@@ -106,6 +106,30 @@
   [255]
   $ cat a
   gold
+  $ rm a
+
+test that normal file in different case on target context is not
+unlinked by largefiles extension.
+
+  $ cat >> .hg/hgrc <<EOF
+  > [extensions]
+  > largefiles=
+  > EOF
+  $ hg update -q -C 1
+  $ hg status -A
+  $ echo 'A as largefiles' > A
+  $ hg add --large A
+  $ hg commit -m '#3'
+  created new head
+  $ hg manifest -r 3
+  .hglf/A
+  $ hg manifest -r 0
+  a
+  $ hg update -q -C 0
+  $ hg status -A
+  C a
+  $ hg update -q -C 3
+  $ hg update -q 0
 
   $ cd ..
 
diff -Nru mercurial-2.6/tests/test-commandserver.py mercurial-2.6.1/tests/test-commandserver.py
--- mercurial-2.6/tests/test-commandserver.py	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-commandserver.py	2013-05-14 23:43:40.000000000 +0000
@@ -252,7 +252,7 @@
     runcommand(server, ['phase', '.'])  # load _phasecache.phaseroots
 
     # strip 1::4 outside server
-    os.system('hg --config extensions.mq= strip 1')
+    os.system('hg -q --config extensions.mq= strip 1')
 
     # shouldn't raise "7966c8e3734d: no node!"
     runcommand(server, ['branches'])
diff -Nru mercurial-2.6/tests/test-commandserver.py.out mercurial-2.6.1/tests/test-commandserver.py.out
--- mercurial-2.6/tests/test-commandserver.py.out	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-commandserver.py.out	2013-05-14 23:43:40.000000000 +0000
@@ -187,6 +187,5 @@
  runcommand phase -p .
  runcommand phase .
 5: public
-saved backup bundle to $TESTTMP/.hg/strip-backup/d3a0a68be6de-backup.hg
  runcommand branches
 default                        1:731265503d86
diff -Nru mercurial-2.6/tests/test-hgignore.t mercurial-2.6.1/tests/test-hgignore.t
--- mercurial-2.6/tests/test-hgignore.t	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-hgignore.t	2013-05-14 23:43:40.000000000 +0000
@@ -124,3 +124,13 @@
   (?:(?:|.*/)[^/]*(?:/|$))
 
   $ cd ..
+
+Check patterns that match only the directory
+
+  $ echo "^dir\$" > .hgignore
+  $ hg status
+  A dir/b.o
+  ? .hgignore
+  ? a.c
+  ? a.o
+  ? syntax
diff -Nru mercurial-2.6/tests/test-largefiles-cache.t mercurial-2.6.1/tests/test-largefiles-cache.t
--- mercurial-2.6/tests/test-largefiles-cache.t	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-largefiles-cache.t	2013-05-14 23:43:40.000000000 +0000
@@ -47,7 +47,7 @@
 
   $ hg update -r0
   getting changed largefiles
-  large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror
+  large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror (glob)
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg status
@@ -64,7 +64,7 @@
 
   $ hg update -r0
   getting changed largefiles
-  large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror
+  large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror (glob)
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg status
diff -Nru mercurial-2.6/tests/test-largefiles.t mercurial-2.6.1/tests/test-largefiles.t
--- mercurial-2.6/tests/test-largefiles.t	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-largefiles.t	2013-05-14 23:43:40.000000000 +0000
@@ -1278,7 +1278,7 @@
   $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0
   $ hg up -r 6
   getting changed largefiles
-  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d
+  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob)
   1 largefiles updated, 2 removed
   4 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ rm normal3
@@ -1299,7 +1299,7 @@
   ! normal3
   $ hg up -Cr.
   getting changed largefiles
-  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d
+  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob)
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
@@ -1321,7 +1321,7 @@
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   getting changed largefiles
-  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d
+  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob)
   1 largefiles updated, 0 removed
 
   $ hg rollback -q
diff -Nru mercurial-2.6/tests/test-lfconvert.t mercurial-2.6.1/tests/test-lfconvert.t
--- mercurial-2.6/tests/test-lfconvert.t	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-lfconvert.t	2013-05-14 23:43:40.000000000 +0000
@@ -343,7 +343,7 @@
   $ rm largefiles-repo/.hg/largefiles/*
   $ hg lfconvert --to-normal issue3519 normalized3519
   initializing destination normalized3519
-  large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:$TESTTMP/largefiles-repo
+  large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:$TESTTMP/largefiles-repo (glob)
   abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad
   [255]
 
diff -Nru mercurial-2.6/tests/test-phases-exchange.t mercurial-2.6.1/tests/test-phases-exchange.t
--- mercurial-2.6/tests/test-phases-exchange.t	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-phases-exchange.t	2013-05-14 23:43:40.000000000 +0000
@@ -1062,6 +1062,7 @@
   |
   o  0 public a-A - 054250a37db4
   
+#if unix-permissions
 
 Pushing From an unlockable repo
 --------------------------------
@@ -1102,3 +1103,4 @@
 
   $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
 
+#endif
diff -Nru mercurial-2.6/tests/test-revert.t mercurial-2.6.1/tests/test-revert.t
--- mercurial-2.6/tests/test-revert.t	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-revert.t	2013-05-14 23:43:40.000000000 +0000
@@ -275,4 +275,28 @@
   $ hg revert --no-backup ignored removed
   $ hg st -mardi
 
+someone set up us the copies
+
+  $ rm .hgignore
+  $ hg update -C
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg mv ignored allyour
+  $ hg copy removed base
+  $ hg commit -m rename
+
+copies and renames, you have no chance to survive make your time (issue3920)
+
+  $ hg update '.^'
+  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ hg revert -rtip -a
+  adding allyour
+  adding base
+  removing ignored
+  $ hg status -C
+  A allyour
+    ignored
+  A base
+    removed
+  R ignored
+
   $ cd ..
diff -Nru mercurial-2.6/tests/test-subrepo.t mercurial-2.6.1/tests/test-subrepo.t
--- mercurial-2.6/tests/test-subrepo.t	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-subrepo.t	2013-05-14 23:43:40.000000000 +0000
@@ -289,7 +289,7 @@
   committing subrepository t
   $ hg push
   pushing to $TESTTMP/t (glob)
-  no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
+  no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
   no changes made to subrepo s since last push to $TESTTMP/t/s
   pushing subrepo t to $TESTTMP/t/t
   searching for changes
@@ -310,7 +310,7 @@
   committing subrepository s
   $ hg push
   pushing to $TESTTMP/t (glob)
-  no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
+  no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
   pushing subrepo s to $TESTTMP/t/s
   searching for changes
   abort: push creates new remote head 12a213df6fa9! (in subrepo s)
@@ -341,7 +341,7 @@
   $ hg clone . ../tcc
   updating to branch default
   cloning subrepo s from $TESTTMP/tc/s
-  cloning subrepo s/ss from $TESTTMP/tc/s/ss
+  cloning subrepo s/ss from $TESTTMP/tc/s/ss (glob)
   cloning subrepo t from $TESTTMP/tc/t
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -349,7 +349,7 @@
 
   $ hg push -R ../tcc .
   pushing to .
-  no changes made to subrepo s/ss since last push to s/ss
+  no changes made to subrepo s/ss since last push to s/ss (glob)
   no changes made to subrepo s since last push to s
   no changes made to subrepo t since last push to t
   searching for changes
@@ -361,7 +361,7 @@
 
   $ hg push ../tcc
   pushing to ../tcc
-  pushing subrepo s/ss to ../tcc/s/ss
+  pushing subrepo s/ss to ../tcc/s/ss (glob)
   searching for changes
   no changes found
   pushing subrepo s to ../tcc/s
@@ -378,7 +378,7 @@
 
   $ hg push ../tcc
   pushing to ../tcc
-  no changes made to subrepo s/ss since last push to ../tcc/s/ss
+  no changes made to subrepo s/ss since last push to ../tcc/s/ss (glob)
   no changes made to subrepo s since last push to ../tcc/s
   no changes made to subrepo t since last push to ../tcc/t
   searching for changes
@@ -392,7 +392,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg push
   pushing to $TESTTMP/t
-  no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
+  no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
   no changes made to subrepo s since last push to $TESTTMP/t/s
   no changes made to subrepo t since last push to $TESTTMP/t/t
   searching for changes
@@ -401,7 +401,7 @@
   $ echo foo >> s/a
   $ hg push
   pushing to $TESTTMP/t
-  no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
+  no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
   no changes made to subrepo s since last push to $TESTTMP/t/s
   no changes made to subrepo t since last push to $TESTTMP/t/t
   searching for changes
@@ -416,7 +416,7 @@
   $ hg -R s/ss commit -m 'test dirty store detection'
   $ hg push
   pushing to $TESTTMP/t
-  pushing subrepo s/ss to $TESTTMP/t/s/ss
+  pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -432,7 +432,7 @@
 
   $ hg push
   pushing to $TESTTMP/t
-  no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
+  no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
   no changes made to subrepo s since last push to $TESTTMP/t/s
   no changes made to subrepo t since last push to $TESTTMP/t/t
   searching for changes
@@ -440,7 +440,7 @@
   [1]
   $ hg push ../tcc
   pushing to ../tcc
-  pushing subrepo s/ss to ../tcc/s/ss
+  pushing subrepo s/ss to ../tcc/s/ss (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -467,7 +467,7 @@
   $ hg backout ".^"
   reverting .hgsubstate
   reverting subrepo s
-  reverting s/a
+  reverting s/a (glob)
   reverting subrepo ss
   reverting subrepo t
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -Nru mercurial-2.6/tests/test-unionrepo.t mercurial-2.6.1/tests/test-unionrepo.t
--- mercurial-2.6/tests/test-unionrepo.t	2013-05-01 22:49:47.000000000 +0000
+++ mercurial-2.6.1/tests/test-unionrepo.t	2013-05-14 23:43:40.000000000 +0000
@@ -112,7 +112,7 @@
 
 annotate works - an indication that linkrevs works
 
-  $ hg --cwd repo1 -R union:../repo2 annotate $TESTTMP/repo1/f -r tip
+  $ hg --cwd repo1 -Runion:../repo2 annotate $TESTTMP/repo1/f -r tip
   3: repo2-1 at top
   0: repo1-0
   1: repo1-1