mercurial/merge.py
changeset 48700 d8577d00c023
parent 48699 10407e8e3807
child 48701 85c69b0dfa8f
equal deleted inserted replaced
48699:10407e8e3807 48700:d8577d00c023
   344     # check case-folding of directories
   344     # check case-folding of directories
   345     foldprefix = unfoldprefix = lastfull = b''
   345     foldprefix = unfoldprefix = lastfull = b''
   346     for fold, f in sorted(foldmap.items()):
   346     for fold, f in sorted(foldmap.items()):
   347         if fold.startswith(foldprefix) and not f.startswith(unfoldprefix):
   347         if fold.startswith(foldprefix) and not f.startswith(unfoldprefix):
   348             # the folded prefix matches but actual casing is different
   348             # the folded prefix matches but actual casing is different
   349             raise error.StateError(
   349             msg = _(b"case-folding collision between %s and directory of %s")
   350                 _(b"case-folding collision between %s and directory of %s")
   350             msg %= (lastfull, f)
   351                 % (lastfull, f)
   351             raise error.StateError(msg)
   352             )
       
   353         foldprefix = fold + b'/'
   352         foldprefix = fold + b'/'
   354         unfoldprefix = f + b'/'
   353         unfoldprefix = f + b'/'
   355         lastfull = f
   354         lastfull = f
   356 
   355 
   357 
   356