Mercurial > public > mercurial-scm > hg
diff hgext/fetch.py @ 9219:3f650f6aa130
merge with crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Thu, 23 Jul 2009 20:44:26 +0200 |
| parents | 07d127e771a1 4c287332e03b |
| children | 1aeb22492b25 |
line wrap: on
line diff
--- 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)))