[PATCH 03 of 19] diff: always use / in paths in diff
Mads Kiilerich
mads at kiilerich.com
Sun Nov 6 20:40:53 CST 2011
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1320630540 -3600
# Node ID 7b05d0387a7ecfd67424fe1a7f183ddf435bf973
# Parent cb8d4e1d4a2a2a874215d5b8cd144d171230e1e8
diff: always use / in paths in diff
Subrepo diffs would sometimes use backslash on windows.
diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -100,6 +100,9 @@
return ""
epoch = util.datestr((0, 0))
+ fn1 = util.pconvert(fn1)
+ fn2 = util.pconvert(fn2)
+
if not opts.text and (util.binary(a) or util.binary(b)):
if a and b and len(a) == len(b) and a == b:
return ""
More information about the Mercurial-devel
mailing list