Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 3679 2956948b81f3
parent 3673 eb0b4a2d70a9
child 3680 69cf255a55a1 
--- a/mercurial/commands.py	Sat Nov 18 23:51:15 2006 -0200
+++ b/mercurial/commands.py	Sat Nov 18 17:20:38 2006 -0200
@@ -213,8 +213,8 @@
                                '--parent'))
         p = repo.lookup(opts['parent'])
         if p not in (p1, p2):
-            raise util.Abort(_('%s is not a parent of %s' %
-                               (short(p), short(node))))
+            raise util.Abort(_('%s is not a parent of %s') %
+                               (short(p), short(node)))
         parent = p
     else:
         if opts['parent']:
@@ -1969,12 +1969,12 @@
             elif misslist is not None:
                 handle(misslist, backupmiss)
             else:
-                if exact: ui.warn(_('file not managed: %s\n' % rel))
+                if exact: ui.warn(_('file not managed: %s\n') % rel)
             break
         else:
             # file has not changed in dirstate
             if node == parent:
-                if exact: ui.warn(_('no changes needed to %s\n' % rel))
+                if exact: ui.warn(_('no changes needed to %s\n') % rel)
                 continue
             if pmf is None:
                 # only need parent manifest in this unlikely case,
Mercurial