{"thread":{"id":"3029","subject":"[PATCH] stgit: typo fixes","startedAt":"2006-01-10T17:14:00Z","lastAt":"2006-01-10T21:48:56Z","messageCount":2,"participants":["Pavel Roskin","Catalin Marinas"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"14416","messageId":"1136913240.2444.1.camel@dv","threadId":"3029","inReplyTo":null,"subject":"[PATCH] stgit: typo fixes","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-01-10T17:14:00Z","receivedAt":"2006-01-10T17:14:00Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Signed-off-by: Pavel Roskin <proski@gnu.org>\n\ndiff --git a/gitmergeonefile.py b/gitmergeonefile.py\nindex 9344d33..2f327a3 100755\n--- a/gitmergeonefile.py\n+++ b/gitmergeonefile.py\n@@ -121,7 +121,7 @@ def __conflict():\n #   $2 - file in branch1 SHA1 (or empty)\n #   $3 - file in branch2 SHA1 (or empty)\n #   $4 - pathname in repository\n-#   $5 - orignal file mode (or empty)\n+#   $5 - original file mode (or empty)\n #   $6 - file in branch1 mode (or empty)\n #   $7 - file in branch2 mode (or empty)\n #\n@@ -140,7 +140,7 @@ __checkout_files()\n if orig_hash:\n     # modified in both\n     if file1_hash and file2_hash:\n-        # if modes are the same (git-read-tree probably dealed with it)\n+        # if modes are the same (git-read-tree probably dealt with it)\n         if file1_hash == file2_hash:\n             if os.system('git-update-index --cacheinfo %s %s %s'\n                          % (file1_mode, file1_hash, path)) != 0:\n@@ -242,8 +242,8 @@ else:\n         __remove_files()\n         sys.exit(os.system('git-checkout-index -u -f -- %s' % path))\n \n-# Un-handled case\n-print >> sys.stderr, 'Error: Un-handled merge conflict'\n+# Unhandled case\n+print >> sys.stderr, 'Error: Unhandled merge conflict'\n print >> sys.stderr, 'gitmergeonefile.py \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"' \\\n       % tuple(sys.argv[1:8])\n __conflict()\ndiff --git a/stgit/commands/common.py b/stgit/commands/common.py\nindex 8084cbd..88f1433 100644\n--- a/stgit/commands/common.py\n+++ b/stgit/commands/common.py\n@@ -1,4 +1,4 @@\n-\"\"\"Function/variables commmon to all the commands\n+\"\"\"Function/variables common to all the commands\n \"\"\"\n \n __copyright__ = \"\"\"\n@@ -92,7 +92,7 @@ def check_head_top_equal():\n     if not crt_series.head_top_equal():\n         raise CmdException, \\\n               'HEAD and top are not the same. You probably committed\\n' \\\n-              '  changes to the tree ouside of StGIT. If you know what you\\n' \\\n+              '  changes to the tree outside of StGIT. If you know what you\\n' \\\n               '  are doing, use the \"refresh -f\" command'\n \n def check_conflicts():\ndiff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py\nindex 6ccdcc9..87fd5da 100644\n--- a/stgit/commands/imprt.py\n+++ b/stgit/commands/imprt.py\n@@ -28,7 +28,7 @@ usage = \"\"\"%prog [options] [<file>]\n \n Create a new patch and apply the given GNU diff file (or the standard\n input). By default, the file name is used as the patch name but this\n-can be overriden with the '--name' option. The patch can either be a\n+can be overridden with the '--name' option. The patch can either be a\n normal file with the description at the top or it can have standard\n mail format, the Subject, From and Date headers being used for\n generating the patch information.\n@@ -219,7 +219,7 @@ def func(parser, options, args):\n     elif filename:\n         patch = os.path.basename(filename)\n     else:\n-        raise CmdException, 'Unkown patch name'\n+        raise CmdException, 'Unknown patch name'\n \n     # the defaults\n     message = author_name = author_email = author_date = committer_name = \\\ndiff --git a/stgit/commands/pick.py b/stgit/commands/pick.py\nindex c01c799..e932cf0 100644\n--- a/stgit/commands/pick.py\n+++ b/stgit/commands/pick.py\n@@ -28,7 +28,7 @@ usage = \"\"\"%prog [options] [<patch@branc\n \n Import a patch from a different branch or a commit object into the\n current series. By default, the name of the imported patch is used as\n-the name of the current patch. It can be overriden with the '--name'\n+the name of the current patch. It can be overridden with the '--name'\n option. A commit object can be reverted with the '--reverse'\n option. The log and author information are those of the commit object.\"\"\"\n \ndiff --git a/stgit/git.py b/stgit/git.py\nindex a7b1c3f..61436bb 100644\n--- a/stgit/git.py\n+++ b/stgit/git.py\n@@ -274,7 +274,7 @@ def rev_parse(git_id):\n         raise GitException, 'Unknown revision: %s' % git_id\n \n def branch_exists(branch):\n-    \"\"\"Existance check for the named branch\n+    \"\"\"Existence check for the named branch\n     \"\"\"\n     for line in _output_lines(['git-rev-parse', '--symbolic', '--all']):\n         if line.strip() == branch:\n\n\n-- \nRegards,\nPavel Roskin\n"},{"id":"14448","messageId":"b0943d9e0601101348s7f94303dl@mail.gmail.com","threadId":"3029","inReplyTo":"1136913240.2444.1.camel@dv","subject":"Re: [PATCH] stgit: typo fixes","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2006-01-10T21:48:56Z","receivedAt":"2006-01-10T21:48:56Z","isPatch":true,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 10/01/06, Pavel Roskin <proski@gnu.org> wrote:\n> Signed-off-by: Pavel Roskin <proski@gnu.org>\n\nApplied, thanks.\n\n> -        # if modes are the same (git-read-tree probably dealed with it)\n> +        # if modes are the same (git-read-tree probably dealt with it)\n\nI think both are correct (at least in the UK).\n\n--\nCatalin\n"}]}