[Bug 4571] New: hg status and hg resolve use different path separators on Windows

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Tue Mar 17 16:38:40 UTC 2015


http://bz.selenic.com/show_bug.cgi?id=4571

          Priority: normal
            Bug ID: 4571
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: hg status and hg resolve use different path separators
                    on Windows
          Severity: bug
    Classification: Unclassified
                OS: Windows
          Reporter: dee at earlsoft.co.uk
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.3.2
         Component: Mercurial
           Product: Mercurial

When merging files in sub directories, hg status and hg resolve show different
path component separators:

C:\Debug\repotest2>hg init

C:\Debug\repotest2>mkdir wibble

C:\Debug\repotest2>notepad wibble\file1.txt

C:\Debug\repotest2>hg add wibble
adding wibble\file1.txt

C:\Debug\repotest2>hg commit -m commit1

C:\Debug\repotest2>notepad wibble\file1.txt

C:\Debug\repotest2>hg commit -m commit2a

C:\Debug\repotest2>hg update 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

C:\Debug\repotest2>notepad wibble\file1.txt

C:\Debug\repotest2>hg commit -m commit2b
created new head

C:\Debug\repotest2>hg update 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

C:\Debug\repotest2>hg merge 2
merging wibble/file1.txt
 output file wibble/file1.txt appears unchanged
was merge successful (yn)? n
merging wibble/file1.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

C:\Debug\repotest2>hg status
M wibble\file1.txt
? file1.txt.orig
? wibble\file1.txt.orig

C:\Debug\repotest2>hg resolve --list
U wibble/file1.txt

C:\Debug\repotest2>

The wiki says internally they should all use /, btu it's not clear whether it
should be presented to the user as the local separator.
http://www.mercurial-scm.org/wiki/CompatibilityRules#Path_name_component_separator

Bug #2875 relates to hg status showing / instead of \.

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list