Mercurial > hg
diff hgext/fetch.py @ 9185:d9a2e6327949
fetch: drop force arg for commit (issue1752)
This appears to be unneeded and forces fetch commits to examine clean files.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 22 Jul 2009 00:28:37 -0500 |
parents | 868670dbc237 |
children | 4c287332e03b |
line wrap: on
line diff
--- a/hgext/fetch.py Tue Jul 21 12:06:32 2009 +0200 +++ b/hgext/fetch.py Wed Jul 22 00:28:37 2009 -0500 @@ -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)))