Mercurial Mercurial > mercurial / 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.
hgext/fetch.py
changeset 9219 3f650f6aa130
parent 9196 07d127e771a1
parent 9188 4c287332e03b
child 9258 1aeb22492b25 
--- a/hgext/fetch.py	Thu Jul 23 00:26:42 2009 +0200
+++ b/hgext/fetch.py	Thu Jul 23 20:44:26 2009 +0200
@@ -127,8 +127,7 @@
             editor = cmdutil.commiteditor
             if opts.get('force_editor') or opts.get('edit'):
                 editor = cmdutil.commitforceeditor
-            n = repo.commit(message, opts['user'], opts['date'],
-                            force=True, editor=editor)
+            n = repo.commit(message, opts['user'], opts['date'], editor=editor)
             ui.status(_('new changeset %d:%s merges remote changes '
                         'with local\n') % (repo.changelog.rev(n),
                                            short(n)))
mercurial