##// END OF EJS Templates
fetch: no need to pass files list to commit
Matt Mackall -
r8698:4ea995e5 default
parent child Browse files
Show More
@@ -121,15 +121,14 b" def fetch(ui, repo, source='default', **"
121 121 err = hg.merge(repo, secondparent, remind=False)
122 122
123 123 if not err:
124 mod, add, rem = repo.status()[:3]
125 124 message = (cmdutil.logmessage(opts) or
126 125 (_('Automated merge with %s') %
127 126 url.removeauth(other.url())))
128 127 editor = cmdutil.commiteditor
129 128 if opts.get('force_editor') or opts.get('edit'):
130 129 editor = cmdutil.commitforceeditor
131 n = repo.commit(mod + add + rem, message, opts['user'],
132 opts['date'], force=True, editor=editor)
130 n = repo.commit(None, message, opts['user'], opts['date'],
131 force=True, editor=editor)
133 132 ui.status(_('new changeset %d:%s merges remote changes '
134 133 'with local\n') % (repo.changelog.rev(n),
135 134 short(n)))
General Comments 0
You need to be logged in to leave comments. Login now