[PATCH] spelling fix: "commited" -> "committed"
Colin McMillen
mcmillen at cs.cmu.edu
Fri Mar 24 12:17:01 UTC 2006
# HG changeset patch
# User mcmillen at cs.cmu.edu
# Node ID ec11107f600bcd534374538f29717528bd01f634
# Parent 18a3e63696004ac7ba8f916349d11986a893a5f5
Spelling fix: "commited" -> "committed"
diff -r 18a3e63696004ac7ba8f916349d11986a893a5f5 -r ec11107f600bcd534374538f29717528bd01f634 mercurial/commands.py
--- a/mercurial/commands.py Tue Mar 21 23:31:04 2006 -0800
+++ b/mercurial/commands.py Fri Mar 24 07:13:27 2006 -0500
@@ -1030,7 +1030,7 @@ def commit(ui, repo, *pats, **opts):
Commit changes to the given files into the repository.
If a list of files is omitted, all changes reported by "hg status"
- will be commited.
+ will be committed.
The HGEDITOR or EDITOR environment variables are used to start an
editor to add a commit comment.
diff -r 18a3e63696004ac7ba8f916349d11986a893a5f5 -r ec11107f600bcd534374538f29717528bd01f634 mercurial/localrepo.py
--- a/mercurial/localrepo.py Tue Mar 21 23:31:04 2006 -0800
+++ b/mercurial/localrepo.py Fri Mar 24 07:13:27 2006 -0500
@@ -1441,7 +1441,7 @@ class localrepository(object):
"just use 'hg update'"))
if allow and not forcemerge:
if modified or added or removed:
- raise util.Abort(_("outstanding uncommited changes"))
+ raise util.Abort(_("outstanding uncommitted changes"))
if not forcemerge and not force:
for f in unknown:
if f in m2:
diff -r 18a3e63696004ac7ba8f916349d11986a893a5f5 -r ec11107f600bcd534374538f29717528bd01f634 tests/test-merge1.out
--- a/tests/test-merge1.out Tue Mar 21 23:31:04 2006 -0800
+++ b/tests/test-merge1.out Fri Mar 24 07:13:27 2006 -0500
@@ -8,12 +8,12 @@ Contents of b should be "this is file b1
Contents of b should be "this is file b1"
This is file b1
%% merge fails
-abort: outstanding uncommited changes
+abort: outstanding uncommitted changes
%% merge expected!
merging for b
merging b
%% merge of b should fail
-abort: outstanding uncommited changes
+abort: outstanding uncommitted changes
%% merge of b expected
merging for b
merging b
diff -r 18a3e63696004ac7ba8f916349d11986a893a5f5 -r ec11107f600bcd534374538f29717528bd01f634 tests/test-up-local-change.out
--- a/tests/test-up-local-change.out Tue Mar 21 23:31:04 2006 -0800
+++ b/tests/test-up-local-change.out Fri Mar 24 07:13:27 2006 -0500
@@ -103,7 +103,7 @@ aborting update spanning branches!
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)
failed
-abort: outstanding uncommited changes
+abort: outstanding uncommitted changes
failed
resolving manifests
force None allow 1 moddirstate True linear False
More information about the Mercurial
mailing list