# HG changeset patch
# User Raphaël Gomès <rgomes@octobus.net>
# Date 1642498033 -3600
# Node ID f13fb742e1d801b42aa01067654e919b48003aa2
# Parent  d1210d56008b5674ce2ee08520d9c05673d56868# Parent  440972d2175d2c0fb4615a1f03f6aeff613a8f9f
branching: merge with stable

diff -r d1210d56008b -r f13fb742e1d8 mercurial/hg.py
--- a/mercurial/hg.py	Mon Jan 17 12:50:13 2022 +0100
+++ b/mercurial/hg.py	Tue Jan 18 10:27:13 2022 +0100
@@ -10,6 +10,7 @@
 
 import errno
 import os
+import posixpath
 import shutil
 import stat
 import weakref
@@ -1285,7 +1286,11 @@
             source = bytes(subpath)
         else:
             p = urlutil.url(source)
-            p.path = os.path.normpath(b'%s/%s' % (p.path, subpath))
+            if p.islocal():
+                normpath = os.path.normpath
+            else:
+                normpath = posixpath.normpath
+            p.path = normpath(b'%s/%s' % (p.path, subpath))
             source = bytes(p)
     other = peer(repo, opts, source)
     cleanupfn = other.close
@@ -1356,7 +1361,11 @@
                 dest = bytes(subpath)
             else:
                 p = urlutil.url(dest)
-                p.path = os.path.normpath(b'%s/%s' % (p.path, subpath))
+                if p.islocal():
+                    normpath = os.path.normpath
+                else:
+                    normpath = posixpath.normpath
+                p.path = normpath(b'%s/%s' % (p.path, subpath))
                 dest = bytes(p)
         branches = path.branch, opts.get(b'branch') or []
 
diff -r d1210d56008b -r f13fb742e1d8 rust/hg-core/src/dirstate_tree/on_disk.rs