##// END OF EJS Templates
messages: replace some instances of "folder" by "directory"...
Martin von Zweigbergk -
r42269:b63b8b7c default
parent child Browse files
Show More
@@ -1965,7 +1965,7 b' class overlayworkingctx(committablectx):'
1965 if not mfiles:
1965 if not mfiles:
1966 return
1966 return
1967 raise error.Abort("error: file '%s' cannot be written because "
1967 raise error.Abort("error: file '%s' cannot be written because "
1968 " '%s/' is a folder in %s (containing %d "
1968 " '%s/' is a directory in %s (containing %d "
1969 "entries: %s)"
1969 "entries: %s)"
1970 % (path, path, self.p1(), len(mfiles),
1970 % (path, path, self.p1(), len(mfiles),
1971 ', '.join(mfiles)))
1971 ', '.join(mfiles)))
@@ -1143,7 +1143,7 b' def debugignore(ui, repo, *files, **opts'
1143 ui.write(_("%s is ignored\n") % uipathfn(f))
1143 ui.write(_("%s is ignored\n") % uipathfn(f))
1144 else:
1144 else:
1145 ui.write(_("%s is ignored because of "
1145 ui.write(_("%s is ignored because of "
1146 "containing folder %s\n")
1146 "containing directory %s\n")
1147 % (uipathfn(f), ignored))
1147 % (uipathfn(f), ignored))
1148 ignorefile, lineno, line = ignoredata
1148 ignorefile, lineno, line = ignoredata
1149 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
1149 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
@@ -252,7 +252,7 b' Test reporting of path conflicts'
252 $ hg rebase -r 3 -d . -n
252 $ hg rebase -r 3 -d . -n
253 starting dry-run rebase; repository will not be changed
253 starting dry-run rebase; repository will not be changed
254 rebasing 3:844a7de3e617 "c"
254 rebasing 3:844a7de3e617 "c"
255 abort: error: file 'c' cannot be written because 'c/' is a folder in e147e6e3c490 (containing 1 entries: c/subdir/file.txt)
255 abort: error: file 'c' cannot be written because 'c/' is a directory in e147e6e3c490 (containing 1 entries: c/subdir/file.txt)
256 [255]
256 [255]
257
257
258 $ cd ..
258 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now