Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.py @ 23543:4dd8a6a1240d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: fixes from proofreading of spell checker issues
author Mads Kiilerich <madski@unity3d.com>
date Thu, 17 Apr 2014 22:47:38 +0200
parents cd9e5e57064d
children aead63705504
line wrap: on
line diff
--- a/mercurial/context.py	Sat Dec 13 09:45:00 2014 +0100
+++ b/mercurial/context.py	Thu Apr 17 22:47:38 2014 +0200
@@ -1038,8 +1038,8 @@
         """generate a manifest corresponding to the values in self._status
 
         This reuse the file nodeid from parent, but we append an extra letter
-        when modified.  Modified files get an extra 'm' while added files get
-        appened an extra 'a'. This is used by manifests merge to see that files
+        when modified. Modified files get an extra 'm' while added files get
+        an extra 'a'. This is used by manifests merge to see that files
         are different and by update logic to avoid deleting newly added files.
         """
 
@@ -1426,9 +1426,9 @@
         against its parent (repo['.']).
         """
         s = self._dirstatestatus(match, listignored, listclean, listunknown)
-        # Filter out symlinks that, in the case of FAT32 and NTFS filesytems,
+        # Filter out symlinks that, in the case of FAT32 and NTFS filesystems,
         # might have accidentally ended up with the entire contents of the file
-        # they are susposed to be linking to.
+        # they are supposed to be linking to.
         s.modified[:] = self._filtersuspectsymlink(s.modified)
         if other != self._repo['.']:
             s = super(workingctx, self)._buildstatus(other, s, match,