Mercurial > public > mercurial-scm > hg-stable
diff hgext/largefiles/overrides.py @ 17424:e7cfe3587ea4
fix trivial spelling errors
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 15 Aug 2012 22:38:42 +0200 |
parents | e51d4aedace9 |
children | 31f32a96e1e3 |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Tue Aug 28 17:59:08 2012 -0500 +++ b/hgext/largefiles/overrides.py Wed Aug 15 22:38:42 2012 +0200 @@ -155,7 +155,7 @@ ui.status(_('removing %s\n') % m.rel(f)) # Need to lock because standin files are deleted then removed from the - # repository and we could race inbetween. + # repository and we could race in-between. wlock = repo.wlock() try: lfdirstate = lfutil.openlfdirstate(ui, repo) @@ -251,7 +251,7 @@ # Override needs to refresh standins so that update's normal merge # will go through properly. Then the other update hook (overriding repo.update) -# will get the new files. Filemerge is also overriden so that the merge +# will get the new files. Filemerge is also overridden so that the merge # will merge standins correctly. def overrideupdate(orig, ui, repo, *pats, **opts): lfdirstate = lfutil.openlfdirstate(ui, repo) @@ -696,7 +696,7 @@ result = orig(ui, repo, source, **opts) # If we do not have the new largefiles for any new heads we pulled, we # will run into a problem later if we try to merge or rebase with one of - # these heads, so cache the largefiles now direclty into the system + # these heads, so cache the largefiles now directly into the system # cache. ui.status(_("caching new largefiles\n")) numcached = 0 @@ -912,7 +912,7 @@ ui.status(_('removing %s\n') % m.rel(f)) # Need to lock because standin files are deleted then removed from the - # repository and we could race inbetween. + # repository and we could race in-between. wlock = repo.wlock() try: lfdirstate = lfutil.openlfdirstate(ui, repo)